From 737f907f265e22efb162d14b2924dc7b82cf81b8 Mon Sep 17 00:00:00 2001 From: Jayasheelan Kumar Date: Tue, 29 Jun 2021 17:10:02 +0530 Subject: [PATCH] New Release v1.6.0 for OCI Service Broker - Adding support for Vinhedo (VCP) region Co-authored-by: Jayasheelan Kumar jayasheelan.kumar@oracle.com --- CHANGELOG.md | 4 ++++ README.md | 2 +- charts/oci-service-broker/Chart.yaml | 2 +- charts/oci-service-broker/docs/installation.md | 12 ++++++------ charts/oci-service-broker/values.yaml | 2 +- oci-service-broker/build.gradle | 12 ++++++------ oci-service-broker/download_SDK_libs.sh | 4 ++-- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 288b5a9..95bb3ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +[1.6.0] + +- Adding support for Vinhedo (VCP) region + [1.5.2] - Adding support for Santiago (SCL) region diff --git a/README.md b/README.md index 797786e..269a8e9 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ See the [Documentation](charts/oci-service-broker/README.md#oci-service-broker) The OCI Service Broker is packaged as Helm chart for making it easy to install in Kubernetes Clusters. The chart can be downloaded from below URL. ``` -https://github.com/oracle/oci-service-broker/releases/download/v1.5.2/oci-service-broker-1.5.2.tgz +https://github.com/oracle/oci-service-broker/releases/download/v1.6.0/oci-service-broker-1.6.0.tgz ``` ## Samples diff --git a/charts/oci-service-broker/Chart.yaml b/charts/oci-service-broker/Chart.yaml index c05e2dc..baf6369 100644 --- a/charts/oci-service-broker/Chart.yaml +++ b/charts/oci-service-broker/Chart.yaml @@ -5,4 +5,4 @@ apiVersion: v1 description: A Helm chart for installing OCI Service Broker into a Kubernetes cluster name: oci-service-broker -version: 1.5.2 +version: 1.6.0 diff --git a/charts/oci-service-broker/docs/installation.md b/charts/oci-service-broker/docs/installation.md index 5d24bbf..e202c36 100644 --- a/charts/oci-service-broker/docs/installation.md +++ b/charts/oci-service-broker/docs/installation.md @@ -75,7 +75,7 @@ brew update && brew install kubernetes-service-catalog-client The OCI Service Broker is packaged as Helm chart for making it easy to install in Kubernetes. The chart is available at [charts/oci-service-broker](../) directory. ```plain -https://github.com/oracle/oci-service-broker/releases/download/v1.5.2/oci-service-broker-1.5.2.tgz +https://github.com/oracle/oci-service-broker/releases/download/v1.6.0/oci-service-broker-1.6.0.tgz ``` ### OCI credentials @@ -114,7 +114,7 @@ For quickly testing out OCI Service Broker, TLS can be disabled and an embedded Helm 3.x syntax: ```bash - helm install oci-service-broker https://github.com/oracle/oci-service-broker/releases/download/v1.5.2/oci-service-broker-1.5.2.tgz \ + helm install oci-service-broker https://github.com/oracle/oci-service-broker/releases/download/v1.6.0/oci-service-broker-1.6.0.tgz \ --set ociCredentials.secretName=ocicredentials \ --set storage.etcd.useEmbedded=true \ --set tls.enabled=false @@ -122,7 +122,7 @@ Helm 3.x syntax: Helm 2.x syntax: ```bash - helm install https://github.com/oracle/oci-service-broker/releases/download/v1.5.2/oci-service-broker-1.5.2.tgz --name oci-service-broker \ + helm install https://github.com/oracle/oci-service-broker/releases/download/v1.6.0/oci-service-broker-1.6.0.tgz --name oci-service-broker \ --set ociCredentials.secretName=ocicredentials \ --set storage.etcd.useEmbedded=true \ --set tls.enabled=false @@ -226,7 +226,7 @@ Replace the values of --set arguments with your appropriate values to install th Helm 3.x syntax: ```bash - helm install oci-service-broker https://github.com/oracle/oci-service-broker/releases/download/v1.5.2/oci-service-broker-1.5.2.tgz \ + helm install oci-service-broker https://github.com/oracle/oci-service-broker/releases/download/v1.6.0/oci-service-broker-1.6.0.tgz \ --set ociCredentials.secretName=ocicredentials \ --set tls.secretName=certsecret \ --set storage.etcd.servers= @@ -234,7 +234,7 @@ Helm 3.x syntax: Helm 2.x syntax: ```bash - helm install https://github.com/oracle/oci-service-broker/releases/download/v1.5.2/oci-service-broker-1.5.2.tgz --name oci-service-broker \ + helm install https://github.com/oracle/oci-service-broker/releases/download/v1.6.0/oci-service-broker-1.6.0.tgz --name oci-service-broker \ --set ociCredentials.secretName=ocicredentials \ --set tls.secretName=certsecret \ --set storage.etcd.servers= @@ -288,7 +288,7 @@ Refer [Restrict access to Service Catalog resources using RBAC](security.md#rest Sample files for various services are available under [`oci-service-broker/samples`](../samples) directory inside the charts. The below command extracts chart that contains the sample files. ```bash -curl -LO https://github.com/oracle/oci-service-broker/releases/download/v1.5.2/oci-service-broker-1.5.2.tgz | tar xz +curl -LO https://github.com/oracle/oci-service-broker/releases/download/v1.6.0/oci-service-broker-1.6.0.tgz | tar xz ``` Create a `ClusterServiceBroker` resource with OCI Service Broker URL to register the broker. Use the below register yaml file after updating the namespace of the OCI Service Broker. diff --git a/charts/oci-service-broker/values.yaml b/charts/oci-service-broker/values.yaml index ffbb088..5153a37 100644 --- a/charts/oci-service-broker/values.yaml +++ b/charts/oci-service-broker/values.yaml @@ -14,7 +14,7 @@ image: repository: iad.ocir.io/oracle/oci-service-broker # Tag of the image - tag: 1.5.2 + tag: 1.6.0 # The image pull policy pullPolicy: Always diff --git a/oci-service-broker/build.gradle b/oci-service-broker/build.gradle index 8ab5c90..2af69dd 100644 --- a/oci-service-broker/build.gradle +++ b/oci-service-broker/build.gradle @@ -30,23 +30,23 @@ apply plugin: 'maven-publish' archivesBaseName = 'oci-service-broker' // Sometimes, the version has to be overridden from command line -version = project.hasProperty('version_num') ? project.getProperty('version_num') : '1.5.2' +version = project.hasProperty('version_num') ? project.getProperty('version_num') : '1.6.0' ext.dockerGroup = 'iad.ocir.io/oci-cnp-dev' mainClassName = 'com.oracle.oci.osb.Broker' sourceCompatibility = 10 ext { - ociSdkVersion = "1.28.0" - jerseyVersion = "2.32" + ociSdkVersion = "2.0.2" + jerseyVersion = "2.34" hk2Version = "2.5.0-b42" hamcrestVersion = "1.3" - jacksonVersion = "2.11.3"; - jacksonDatabindVersion = "2.11.3"; + jacksonVersion = "2.12.0"; + jacksonDatabindVersion = "2.12.0"; javaxwsrsVersion = "2.1.1" bedrockVersion = "5.0.7" jetcdVersion = "0.3.0" - guvaVersion = "27.1-jre" + guvaVersion = "30.1-jre" srcBuildRepo = project.hasProperty('src_build_repo') ? project.getProperty('src_build_repo') : "${projectDir}/src-build-repo/" unbundleOciSdk = project.hasProperty('unbundle_oci_java_sdk') ? project.getProperty('unbundle_oci_java_sdk').toBoolean() : false depLibJarPath = "build/lib" diff --git a/oci-service-broker/download_SDK_libs.sh b/oci-service-broker/download_SDK_libs.sh index a4267ce..e28195d 100755 --- a/oci-service-broker/download_SDK_libs.sh +++ b/oci-service-broker/download_SDK_libs.sh @@ -9,7 +9,7 @@ #sdk jars and their dependency jars. The jars are written to libs directory. SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -SDK_VERSION="1.28.0" +SDK_VERSION="2.0.2" TEMP_DIR="/tmp/oci-java-sdk" rm -rf ${TEMP_DIR} mkdir -p ${TEMP_DIR} @@ -17,7 +17,7 @@ mkdir -p ${SCRIPT_DIR}/libs echo "Downloading oci-java-sdk version v${SDK_VERSION} and the dependent libraries..." curl -sSL https://github.com/oracle/oci-java-sdk/releases/download/v${SDK_VERSION}/oci-java-sdk-${SDK_VERSION}.zip -o ${TEMP_DIR}/oci-java-sdk.zip unzip -qq ${TEMP_DIR}/oci-java-sdk.zip -d ${TEMP_DIR} -cp ${TEMP_DIR}/lib/oci-java-sdk-full-1.28.0.jar ${SCRIPT_DIR}/libs/ +cp ${TEMP_DIR}/lib/oci-java-sdk-full-2.0.2.jar ${SCRIPT_DIR}/libs/ cp ${TEMP_DIR}/third-party/lib/*.jar ${SCRIPT_DIR}/libs/ rm -rf ${TEMP_DIR} echo "oci-java-sdk and the dependent libraries are downloaded to ${SCRIPT_DIR}/libs directory"