From 415927ace0a6a52af355bf566330d4d0622ecea7 Mon Sep 17 00:00:00 2001 From: pasant9 Date: Thu, 16 Mar 2023 10:08:05 +0530 Subject: [PATCH 1/4] Update charts for 4.1.0-2 release --- advanced/am-pattern-1/Chart.yaml | 2 +- advanced/am-pattern-1/README.md | 20 ++++++++++---------- advanced/am-pattern-1/requirements.yaml | 2 +- advanced/am-pattern-2/Chart.yaml | 2 +- advanced/am-pattern-2/README.md | 20 ++++++++++---------- advanced/am-pattern-2/requirements.yaml | 2 +- advanced/am-pattern-3/Chart.yaml | 2 +- advanced/am-pattern-3/README.md | 20 ++++++++++---------- advanced/am-pattern-3/requirements.yaml | 2 +- advanced/am-pattern-4/Chart.yaml | 2 +- advanced/am-pattern-4/README.md | 14 +++++++------- advanced/am-pattern-4/requirements.yaml | 2 +- advanced/mysql-am/Chart.yaml | 2 +- simple/am-single/Chart.yaml | 2 +- simple/am-single/README.md | 16 ++++++++-------- simple/am-single/requirements.yaml | 2 +- 16 files changed, 56 insertions(+), 56 deletions(-) diff --git a/advanced/am-pattern-1/Chart.yaml b/advanced/am-pattern-1/Chart.yaml index 2b75d11b..aa18a0cc 100644 --- a/advanced/am-pattern-1/Chart.yaml +++ b/advanced/am-pattern-1/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 appVersion: "4.1.0" description: A Helm chart for the deployment of WSO2 API Manager Pattern 1 (HA All-In-One Deployment) name: am-pattern-1 -version: 4.1.0-1 +version: 4.1.0-2 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/am-pattern-1/README.md b/advanced/am-pattern-1/README.md index 59e2bfcc..5746672d 100644 --- a/advanced/am-pattern-1/README.md +++ b/advanced/am-pattern-1/README.md @@ -59,13 +59,13 @@ Deploy the Kubernetes resources using the Helm Chart - Helm version 2 ``` - helm install --name wso2/am-pattern-1 --version 4.1.0-1 --namespace + helm install --name wso2/am-pattern-1 --version 4.1.0-2 --namespace ``` - Helm version 3 ``` - helm install wso2/am-pattern-1 --version 4.1.0-1 --namespace --create-namespace + helm install wso2/am-pattern-1 --version 4.1.0-2 --namespace --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -76,7 +76,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name wso2/am-pattern-1 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name wso2/am-pattern-1 --version 4.1.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` #### Install Chart From Source @@ -99,13 +99,13 @@ Deploy the Kubernetes resources using the Helm Chart - Helm version 2 ``` - helm install --dep-up --name /am-pattern-1 --version 4.1.0-1 --namespace + helm install --dep-up --name /am-pattern-1 --version 4.1.0-2 --namespace ``` - Helm version 3 ``` - helm install /am-pattern-1 --version 4.1.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-1 --version 4.1.0-2 --namespace --dependency-update --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -116,7 +116,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name /am-pattern-1 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name /am-pattern-1 --version 4.1.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` Or else, you can configure the default configurations inside the am-pattern-1 helm chart [values.yaml](https://github.com/wso2/kubernetes-apim/blob/master/advanced/am-pattern-1/values.yaml) file. Refer [this](https://helm.sh/docs/chart_template_guide/values_files/) for to learn more details about the `values.yaml` file. @@ -132,7 +132,7 @@ From the above Helm commands, base image of a Micro Integrator is deployed (with - `IMAGE_PULL_SECRET` will refer to the created image pull secret

>3. Deploy the helm resource using following command.

> ``` -> helm install wso2/am-pattern-1 --version 4.1.0-1 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= +> helm install wso2/am-pattern-1 --version 4.1.0-2 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= > ``` ### Choreo Analytics @@ -144,13 +144,13 @@ The following example shows how to enable Analytics with the helm charts. Helm v2 ``` -helm install --name wso2/am-pattern-1 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= +helm install --name wso2/am-pattern-1 --version 4.1.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= ``` Helm v3 ``` -helm install wso2/am-pattern-1 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace +helm install wso2/am-pattern-1 --version 4.1.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace ``` You will be able to see the Analytics data when you log into Choreo Analytics Portal. @@ -338,5 +338,5 @@ If you want to setup API Manager only without Micro Integrator, you have to inst * Deploy Helm charts ```helm - helm install /am-pattern-1 --version 4.1.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-1 --version 4.1.0-2 --namespace --dependency-update --create-namespace ``` diff --git a/advanced/am-pattern-1/requirements.yaml b/advanced/am-pattern-1/requirements.yaml index b52cb5de..bf00d478 100644 --- a/advanced/am-pattern-1/requirements.yaml +++ b/advanced/am-pattern-1/requirements.yaml @@ -14,7 +14,7 @@ dependencies: - name: mysql-am - version: "4.1.0-1" + version: "4.1.0-2" repository: "https://helm.wso2.com" condition: wso2.deployment.dependencies.cluster_mysql - name: nfs-server-provisioner diff --git a/advanced/am-pattern-2/Chart.yaml b/advanced/am-pattern-2/Chart.yaml index 2b8aefda..085de0db 100644 --- a/advanced/am-pattern-2/Chart.yaml +++ b/advanced/am-pattern-2/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 appVersion: "4.1.0" description: A Helm chart for the deployment of WSO2 API Management deployment pattern 2 name: am-pattern-2 -version: 4.1.0-1 +version: 4.1.0-2 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/am-pattern-2/README.md b/advanced/am-pattern-2/README.md index 181ba728..468722a0 100644 --- a/advanced/am-pattern-2/README.md +++ b/advanced/am-pattern-2/README.md @@ -59,13 +59,13 @@ Deploy the Kubernetes resources using the Helm Chart - Helm version 2 ``` - helm install --name wso2/am-pattern-2 --version 4.1.0-1 --namespace + helm install --name wso2/am-pattern-2 --version 4.1.0-2 --namespace ``` - Helm version 3 ``` - helm install wso2/am-pattern-2 --version 4.1.0-1 --namespace --create-namespace + helm install wso2/am-pattern-2 --version 4.1.0-2 --namespace --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -91,7 +91,7 @@ Below example is to provide WSO2 Subscription credentials for all WSO2 API Manag export SUBSCRIPTION_USERNAME= export SUBSCRIPTION_PASSWORD= -helm install --name wso2/am-pattern-2 --version 4.1.0-1 --namespace --set wso2.subscription.username=$SUBSCRIPTION_USERNAME --set wso2.subscription.password=$SUBSCRIPTION_PASSWORD --set am-pattern-1.wso2.subscription.username=$SUBSCRIPTION_USERNAME --set am-pattern-1.wso2.subscription.password=$SUBSCRIPTION_PASSWORD +helm install --name wso2/am-pattern-2 --version 4.1.0-2 --namespace --set wso2.subscription.username=$SUBSCRIPTION_USERNAME --set wso2.subscription.password=$SUBSCRIPTION_PASSWORD --set am-pattern-1.wso2.subscription.username=$SUBSCRIPTION_USERNAME --set am-pattern-1.wso2.subscription.password=$SUBSCRIPTION_PASSWORD ``` #### Install Chart From Source @@ -114,13 +114,13 @@ Deploy the Kubernetes resources using the Helm Chart - Helm version 2 ``` - helm install --dep-up --name /am-pattern-2 --version 4.1.0-1 --namespace + helm install --dep-up --name /am-pattern-2 --version 4.1.0-2 --namespace ``` - Helm version 3 ``` - helm install /am-pattern-2 --version 4.1.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-2 --version 4.1.0-2 --namespace --dependency-update --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -131,7 +131,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name /am-pattern-2 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name /am-pattern-2 --version 4.1.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` Or else, you can configure the default configurations inside the am-pattern-1 helm chart [values.yaml](https://github.com/wso2/kubernetes-apim/blob/master/advanced/am-pattern-1/values.yaml) file. Refer [this](https://helm.sh/docs/chart_template_guide/values_files/) for to learn more details about the `values.yaml` file. @@ -147,7 +147,7 @@ From the above Helm commands, base image of a Micro Integrator is deployed (with - `IMAGE_PULL_SECRET` will refer to the created image pull secret

>3. Deploy the helm resource using following command.

> ``` -> helm install wso2/am-pattern-2 --version 4.1.0-1 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= +> helm install wso2/am-pattern-2 --version 4.1.0-2 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= > ``` ### Choreo Analytics @@ -159,13 +159,13 @@ The following example shows how to enable Analytics with the helm charts. Helm v2 ``` -helm install --name wso2/am-pattern-2 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= +helm install --name wso2/am-pattern-2 --version 4.1.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= ``` Helm v3 ``` -helm install wso2/am-pattern-2 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace +helm install wso2/am-pattern-2 --version 4.1.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace ``` You will be able to see the Analytics data when you log into Choreo Analytics Portal. @@ -391,5 +391,5 @@ If you want to setup API Manager only without Micro Integrator, you have to inst * Deploy Helm charts ```helm - helm install /am-pattern-2 --version 4.1.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-2 --version 4.1.0-2 --namespace --dependency-update --create-namespace ``` \ No newline at end of file diff --git a/advanced/am-pattern-2/requirements.yaml b/advanced/am-pattern-2/requirements.yaml index c8ed1f7d..3c581c5a 100644 --- a/advanced/am-pattern-2/requirements.yaml +++ b/advanced/am-pattern-2/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: am-pattern-1 - version: "4.1.0-1" + version: "4.1.0-2" repository: "https://helm.wso2.com" diff --git a/advanced/am-pattern-3/Chart.yaml b/advanced/am-pattern-3/Chart.yaml index 2730742c..6fac456c 100644 --- a/advanced/am-pattern-3/Chart.yaml +++ b/advanced/am-pattern-3/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 appVersion: "4.1.0" description: A Helm chart for the deployment of WSO2 API Management deployment pattern 3 name: am-pattern-3 -version: 4.1.0-1 +version: 4.1.0-2 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/am-pattern-3/README.md b/advanced/am-pattern-3/README.md index 0c7ba1c6..3cb4c46e 100644 --- a/advanced/am-pattern-3/README.md +++ b/advanced/am-pattern-3/README.md @@ -57,7 +57,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] Helm version 2 ``` - helm install --name wso2/am-pattern-3 --version 4.1.0-1 --namespace + helm install --name wso2/am-pattern-3 --version 4.1.0-2 --namespace ``` Helm version 3 @@ -65,7 +65,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] - Deploy the Kubernetes resources using the Helm Chart ``` - helm install wso2/am-pattern-3 --version 4.1.0-1 --namespace --create-namespace + helm install wso2/am-pattern-3 --version 4.1.0-2 --namespace --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -76,7 +76,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name wso2/am-pattern-3 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name wso2/am-pattern-3 --version 4.1.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` #### Install Chart From Source @@ -97,7 +97,7 @@ git clone https://github.com/wso2/kubernetes-apim.git Helm version 2 ``` - helm install --dep-up --name /am-pattern-3 --version 4.1.0-1 --namespace + helm install --dep-up --name /am-pattern-3 --version 4.1.0-2 --namespace ``` Helm version 3 @@ -105,7 +105,7 @@ git clone https://github.com/wso2/kubernetes-apim.git - Deploy the Kubernetes resources using the Helm Chart ``` - helm install /am-pattern-3 --version 4.1.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-3 --version 4.1.0-2 --namespace --dependency-update --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -116,7 +116,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name /am-pattern-3 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name /am-pattern-3 --version 4.1.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` Or else, you can configure the default configurations inside the am-pattern-3 helm chart [values.yaml](https://github.com/wso2/kubernetes-apim/blob/master/advanced/am-pattern-3/values.yaml) file. Refer [this](https://helm.sh/docs/chart_template_guide/values_files/) for to learn more details about the `values.yaml` file. @@ -132,7 +132,7 @@ From the above Helm commands, base image of a Micro Integrator is deployed (with - `IMAGE_PULL_SECRET` will refer to the created image pull secret

>3. Deploy the helm resource using following command.

> ``` -> helm install wso2/am-pattern-3 --version 4.1.0-1 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= +> helm install wso2/am-pattern-3 --version 4.1.0-2 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= > ``` ### Choreo Analytics @@ -144,13 +144,13 @@ The following example shows how to enable Analytics with the helm charts. Helm v2 ``` -helm install --name wso2/am-pattern-3 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= +helm install --name wso2/am-pattern-3 --version 4.1.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= ``` Helm v3 ``` -helm install wso2/am-pattern-3 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace +helm install wso2/am-pattern-3 --version 4.1.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace ``` You will be able to see the Analytics data when you log into Choreo Analytics Portal. @@ -347,5 +347,5 @@ If you want to setup API Manager only without Micro Integrator, you have to inst * Deploy Helm charts ```helm - helm install /am-pattern-3 --version 4.1.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-3 --version 4.1.0-2 --namespace --dependency-update --create-namespace ``` diff --git a/advanced/am-pattern-3/requirements.yaml b/advanced/am-pattern-3/requirements.yaml index e86d7f7d..aa03b3c2 100644 --- a/advanced/am-pattern-3/requirements.yaml +++ b/advanced/am-pattern-3/requirements.yaml @@ -14,7 +14,7 @@ dependencies: - name: mysql-am - version: "4.1.0-1" + version: "4.1.0-2" repository: "https://helm.wso2.com" condition: wso2.deployment.dependencies.cluster_mysql - name: nfs-server-provisioner diff --git a/advanced/am-pattern-4/Chart.yaml b/advanced/am-pattern-4/Chart.yaml index b67a1bb8..167e73d4 100644 --- a/advanced/am-pattern-4/Chart.yaml +++ b/advanced/am-pattern-4/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 appVersion: "4.1.0" description: A Helm chart for the deployment of WSO2 API Management deployment pattern 4 name: am-pattern-4 -version: 4.1.0-1 +version: 4.1.0-2 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/am-pattern-4/README.md b/advanced/am-pattern-4/README.md index 718eb71c..93f29935 100644 --- a/advanced/am-pattern-4/README.md +++ b/advanced/am-pattern-4/README.md @@ -57,7 +57,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] Helm version 2 ``` - helm install --name wso2/am-pattern-4 --version 4.1.0-1 --namespace + helm install --name wso2/am-pattern-4 --version 4.1.0-2 --namespace ``` Helm version 3 @@ -65,7 +65,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] - Deploy the Kubernetes resources using the Helm Chart ``` - helm install wso2/am-pattern-4 --version 4.1.0-1 --namespace --create-namespace + helm install wso2/am-pattern-4 --version 4.1.0-2 --namespace --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -76,7 +76,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name wso2/am-pattern-4 --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name wso2/am-pattern-4 --version 4.1.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` #### Install Chart From Source @@ -132,7 +132,7 @@ From the above Helm commands, base image of a Micro Integrator is deployed (with - `IMAGE_PULL_SECRET` will refer to the created image pull secret

>3. Deploy the helm resource using following command.

> ``` -> helm install wso2/am-pattern-4 --version 4.1.0-1 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= +> helm install wso2/am-pattern-4 --version 4.1.0-2 --namespace --set wso2.deployment.mi.dockerRegistry= --set wso2.deployment.mi.imageName= --set wso2.deployment.mi.imageTag= --set wso2.deployment.mi.imagePullSecrets= > ``` ### Choreo Analytics @@ -144,13 +144,13 @@ The following example shows how to enable Analytics with the helm charts. Helm v2 ``` -helm install --name wso2/am-pattern-4 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= +helm install --name wso2/am-pattern-4 --version 4.1.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= ``` Helm v3 ``` -helm install wso2/am-pattern-4 --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace +helm install wso2/am-pattern-4 --version 4.1.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace ``` You will be able to see the Analytics data when you log into Choreo Analytics Portal. @@ -359,5 +359,5 @@ If you want to setup API Manager only without Micro Integrator, you have to inst * Deploy Helm charts ```helm - helm install /am-pattern-4 --version 4.1.0-1 --namespace --dependency-update --create-namespace + helm install /am-pattern-4 --version 4.1.0-2 --namespace --dependency-update --create-namespace ``` diff --git a/advanced/am-pattern-4/requirements.yaml b/advanced/am-pattern-4/requirements.yaml index ebbf879b..9d02fc86 100644 --- a/advanced/am-pattern-4/requirements.yaml +++ b/advanced/am-pattern-4/requirements.yaml @@ -13,7 +13,7 @@ # limitations under the License. dependencies: - name: mysql-am - version: "4.1.0-1" + version: "4.1.0-2" repository: "https://helm.wso2.com" condition: wso2.deployment.dependencies.cluster_mysql - name: nfs-server-provisioner diff --git a/advanced/mysql-am/Chart.yaml b/advanced/mysql-am/Chart.yaml index 2b15a101..9f741827 100644 --- a/advanced/mysql-am/Chart.yaml +++ b/advanced/mysql-am/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 appVersion: "5.7" description: A Helm chart for MySQL based deployment of WSO2 API Management Datasources name: mysql-am -version: 4.1.0-1 +version: 4.1.0-2 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/simple/am-single/Chart.yaml b/simple/am-single/Chart.yaml index 2701c79f..2e1f728b 100644 --- a/simple/am-single/Chart.yaml +++ b/simple/am-single/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 appVersion: "4.1.0" description: A Helm chart for the deployment of WSO2 API Manager Single Node. name: am-single-node -version: 4.1.0-1 +version: 4.1.0-2 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/simple/am-single/README.md b/simple/am-single/README.md index 9699342e..ccfaf9be 100644 --- a/simple/am-single/README.md +++ b/simple/am-single/README.md @@ -57,7 +57,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] Helm version 2 ``` - helm install --name wso2/am-single-node --version 4.1.0-1 --namespace + helm install --name wso2/am-single-node --version 4.1.0-2 --namespace ``` Helm version 3 @@ -65,7 +65,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository] - Deploy the Kubernetes resources using the Helm Chart ``` - helm install wso2/am-single-node --version 4.1.0-1 --namespace --create-namespace + helm install wso2/am-single-node --version 4.1.0-2 --namespace --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -76,7 +76,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name wso2/am-single-node --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name wso2/am-single-node --version 4.1.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` #### Install Chart From Source @@ -97,7 +97,7 @@ git clone https://github.com/wso2/kubernetes-apim.git Helm version 2 ``` - helm install --dep-up --name /am-single --version 4.1.0-1 --namespace + helm install --dep-up --name /am-single --version 4.1.0-2 --namespace ``` Helm version 3 @@ -105,7 +105,7 @@ git clone https://github.com/wso2/kubernetes-apim.git - Deploy the Kubernetes resources using the Helm Chart ``` - helm install /am-single --version 4.1.0-1 --namespace --dependency-update --create-namespace + helm install /am-single --version 4.1.0-2 --namespace --dependency-update --create-namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -116,7 +116,7 @@ please provide your WSO2 Subscription credentials via input values (using `--set Please see the following example. ``` - helm install --name /am-single --version 4.1.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name /am-single --version 4.1.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` ### Choreo Analytics @@ -127,13 +127,13 @@ The following example shows how to enable Analytics with the helm charts. Helm v2 ``` -helm install --name wso2/am-single-node --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= +helm install --name wso2/am-single-node --version 4.1.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= ``` Helm v3 ``` -helm install wso2/am-single-node --version 4.1.0-1 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace +helm install wso2/am-single-node --version 4.1.0-2 --namespace --set wso2.choreoAnalytics.enabled=true --set wso2.choreoAnalytics.endpoint= --set wso2.choreoAnalytics.onpremKey= --create-namespace ``` You will be able to see the Analytics data when you log into Choreo Analytics Portal. diff --git a/simple/am-single/requirements.yaml b/simple/am-single/requirements.yaml index 31f339ae..c9988d62 100644 --- a/simple/am-single/requirements.yaml +++ b/simple/am-single/requirements.yaml @@ -14,7 +14,7 @@ dependencies: - name: mysql-am - version: "4.1.0-1" + version: "4.1.0-2" repository: "https://helm.wso2.com" condition: wso2.deployment.dependencies.cluster_mysql - name: nfs-server-provisioner From 608d03a2b97e916a5d195e2ac22a8fcda6a4baf0 Mon Sep 17 00:00:00 2001 From: pasant9 Date: Thu, 16 Mar 2023 10:21:30 +0530 Subject: [PATCH 2/4] Update READMEs with websocket ingress configs --- advanced/am-pattern-1/README.md | 12 +++++++++++- advanced/am-pattern-2/README.md | 12 +++++++++++- advanced/am-pattern-3/README.md | 10 ++++++++++ advanced/am-pattern-4/README.md | 10 ++++++++++ simple/am-single/README.md | 11 ++++++++++- 5 files changed, 52 insertions(+), 3 deletions(-) diff --git a/advanced/am-pattern-1/README.md b/advanced/am-pattern-1/README.md index 5746672d..b8399511 100644 --- a/advanced/am-pattern-1/README.md +++ b/advanced/am-pattern-1/README.md @@ -186,6 +186,13 @@ API Manager Websub - ADDRESS: External IP (`EXTERNAL-IP`) exposing the API Manager's Websub service to outside of the Kubernetes environment - PORTS: Externally exposed service ports of the API Manager' Websub service +API Manager WebSocket + +- NAME: Metadata name of the Kubernetes Ingress resource (defaults to `wso2am-pattern-1-am-websocket-ingress`) +- HOSTS: Hostname of the WSO2 API Manager's WebSocket service (``) +- ADDRESS: External IP (`EXTERNAL-IP`) exposing the API Manager's WebSocket service to outside of the Kubernetes environment +- PORTS: Externally exposed service ports of the API Manager' WebSocket service + Micro Integrator Management APIs - NAME: Metadata name of the Kubernetes Ingress resource (defaults to `wso2am-pattern-1-mi-1-management-ingress`) @@ -202,7 +209,7 @@ If the defined hostnames are not backed by a DNS service, for the purpose of eva hostnames and the external IP in the `/etc/hosts` file at the client-side. ``` - + ``` ### 4. Access Management Consoles @@ -270,6 +277,9 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.ingress.websub.enabled` | If enabled, create ingress resource for WebSub service | true | | `wso2.deployment.am.ingress.websub.hostname` | Hostname for API Manager Websub services | `websub.am.wso2.com` | | `wso2.deployment.am.ingress.websub.annotations` | Ingress resource annotations for API Manager Websub | Community NGINX Ingress controller annotations | +| `wso2.deployment.am.ingress.websocket.enabled` | If enabled, create ingress resource for WebSocket service | true | +| `wso2.deployment.am.ingress.websocket.hostname` | Hostname for API Manager WebSocket services | `websocket.am.wso2.com` | +| `wso2.deployment.am.ingress.websocket.annotations` | Ingress resource annotations for API Manager WebSocket | Community NGINX Ingress controller annotations | ###### Micro Integrator Server Configurations diff --git a/advanced/am-pattern-2/README.md b/advanced/am-pattern-2/README.md index 468722a0..9405b3fd 100644 --- a/advanced/am-pattern-2/README.md +++ b/advanced/am-pattern-2/README.md @@ -201,6 +201,13 @@ API Manager Websub - ADDRESS: External IP (`EXTERNAL-IP`) exposing the API Manager's Websub service to outside of the Kubernetes environment - PORTS: Externally exposed service ports of the API Manager' Websub service +API Manager WebSocket + +- NAME: Metadata name of the Kubernetes Ingress resource (defaults to `wso2am-pattern-1-am-websocket-ingress`) +- HOSTS: Hostname of the WSO2 API Manager's WebSocket service (``) +- ADDRESS: External IP (`EXTERNAL-IP`) exposing the API Manager's WebSocket service to outside of the Kubernetes environment +- PORTS: Externally exposed service ports of the API Manager' WebSocket service + Micro Integrator Management APIs of Tenant 1 - NAME: Metadata name of the Kubernetes Ingress resource (defaults to `wso2am-pattern-1-mi-1-management-ingress`) @@ -224,7 +231,7 @@ If the defined hostnames are not backed by a DNS service, for the purpose of eva hostnames and the external IP in the `/etc/hosts` file at the client-side. ``` - + ``` ### 4. Access Management Consoles @@ -302,6 +309,9 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `am-pattern-1.wso2.deployment.am.ingress.websub.enabled` | If enabled, create ingress resource for WebSub service | true | | `am-pattern-1.wso2.deployment.am.ingress.websub.hostname` | Hostname for API Manager Websub services | `websub.am.wso2.com` | | `am-pattern-1.wso2.deployment.am.ingress.websub.annotations` | Ingress resource annotations for API Manager Websub | Community NGINX Ingress controller annotations | +| `am-pattern-1.wso2.deployment.am.ingress.websocket.enabled` | If enabled, create ingress resource for WebSocket service | true | +| `am-pattern-1.wso2.deployment.am.ingress.websocket.hostname` | Hostname for API Manager WebSocket services | `websocket.am.wso2.com` | +| `am-pattern-1.wso2.deployment.am.ingress.websocket.annotations` | Ingress resource annotations for API Manager WebSocket | Community NGINX Ingress controller annotations | #### Micro Integrator Server Configurations for Tenant 1 diff --git a/advanced/am-pattern-3/README.md b/advanced/am-pattern-3/README.md index 3cb4c46e..87278eb8 100644 --- a/advanced/am-pattern-3/README.md +++ b/advanced/am-pattern-3/README.md @@ -186,6 +186,13 @@ API Manager Websub - ADDRESS: External IP (EXTERNAL-IP) exposing the API Manager's Websub service to outside of the Kubernetes environment - PORTS: Externally exposed service ports of the API Manager's Websub service +API Manager WebSocket + +- NAME: Metadata name of the Kubernetes Ingress resource (defaults to wso2am-pattern-3-am-websocket-ingress) +- HOSTS: Hostname of the WSO2 API Manager's WebSocket service (``) +- ADDRESS: External IP (EXTERNAL-IP) exposing the API Manager's WebSocket service to outside of the Kubernetes environment +- PORTS: Externally exposed service ports of the API Manager's WebSocket service + Micro Integrator Management APIs - NAME: Metadata name of the Kubernetes Ingress resource (defaults to wso2am-pattern-3-mi-1-management-ingress) @@ -260,6 +267,9 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.websub.ingress.enabled` | If enabled, create ingress resource for WebSub service | true | | `wso2.deployment.am.websub.ingress.hostname` | Hostname for API Manager WebSub service | `websub.am.wso2.com` | | `wso2.deployment.am.websub.ingress.annotations` | Ingress resource annotations for API Manager WebSub | Community NGINX Ingress controller annotations | +| `wso2.deployment.am.websocket.ingress.enabled` | If enabled, create ingress resource for WebSocket service | true | +| `wso2.deployment.am.websocket.ingress.hostname` | Hostname for API Manager WebSocket service | `websocket.am.wso2.com` | +| `wso2.deployment.am.websocket.ingress.annotations` | Ingress resource annotations for API Manager WebSocket | Community NGINX Ingress controller annotations | | `wso2.deployment.am.gateway.ingress.enabled` | If enabled, create ingress resource for API Manager Gateway | true | | `wso2.deployment.am.gateway.ingress.hostname` | Hostname for API Manager Gateway | `gateway.am.wso2.com` | | `wso2.deployment.am.gateway.ingress.annotations` | Ingress resource annotations for API Manager Gateway | Community NGINX Ingress controller annotations | diff --git a/advanced/am-pattern-4/README.md b/advanced/am-pattern-4/README.md index 93f29935..9325e560 100644 --- a/advanced/am-pattern-4/README.md +++ b/advanced/am-pattern-4/README.md @@ -186,6 +186,13 @@ API Manager Websub - ADDRESS: External IP (EXTERNAL-IP) exposing the API Manager's Websub service to outside of the Kubernetes environment - PORTS: Externally exposed service ports of the API Manager's Websub service +API Manager WebSocket + +- NAME: Metadata name of the Kubernetes Ingress resource (defaults to wso2am-pattern-4-am-websocket-ingress) +- HOSTS: Hostname of the WSO2 API Manager's WebSocket service (``) +- ADDRESS: External IP (EXTERNAL-IP) exposing the API Manager's WebSocket service to outside of the Kubernetes environment +- PORTS: Externally exposed service ports of the API Manager's WebSocket service + Micro Integrator Management APIs - NAME: Metadata name of the Kubernetes Ingress resource (defaults to wso2am-pattern-4-mi-1-management-ingress) @@ -260,6 +267,9 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.websub.ingress.enabled` | If enabled, create ingress resource for WebSub service | true | | `wso2.deployment.am.websub.ingress.hostname` | Hostname for API Manager WebSub service | `websub.am.wso2.com` | | `wso2.deployment.am.websub.ingress.annotations` | Ingress resource annotations for API Manager WebSub | Community NGINX Ingress controller annotations | +| `wso2.deployment.am.websocket.ingress.enabled` | If enabled, create ingress resource for WebSocket service | true | +| `wso2.deployment.am.websocket.ingress.hostname` | Hostname for API Manager WebSocket service | `websocket.am.wso2.com` | +| `wso2.deployment.am.websocket.ingress.annotations` | Ingress resource annotations for API Manager WebSocket | Community NGINX Ingress controller annotations | | `wso2.deployment.am.gateway.ingress.enabled` | If enabled, create ingress resource for API Manager Gateway | true | | `wso2.deployment.am.gateway.ingress.hostname` | Hostname for API Manager Gateway | `gateway.am.wso2.com` | | `wso2.deployment.am.gateway.ingress.annotations` | Ingress resource annotations for API Manager Gateway | Community NGINX Ingress controller annotations | diff --git a/simple/am-single/README.md b/simple/am-single/README.md index ccfaf9be..1bdce77a 100644 --- a/simple/am-single/README.md +++ b/simple/am-single/README.md @@ -167,6 +167,12 @@ API Manager WebSub - HOSTS: Hostname of the WSO2 API Manager's Gateway (WebSub) service (``) - ADDRESS: External IP (`EXTERNAL-IP`) exposing the API Manager's Gateway service to outside of the Kubernetes environment - PORTS: Externally exposed service ports of the API Manager' Gateway (WebSub) service + +API Manager WebSocket +- NAME: Metadata name of the Kubernetes Ingress resource (defaults to `wso2am-single-node-am-websocket-ingress`) +- HOSTS: Hostname of the WSO2 API Manager's Gateway (WebSocket) service (``) +- ADDRESS: External IP (`EXTERNAL-IP`) exposing the API Manager's Gateway service to outside of the Kubernetes environment +- PORTS: Externally exposed service ports of the API Manager' Gateway (WebSocket) service ### 3. Add a DNS record mapping the hostnames and the external IP If the defined hostnames (in the previous step) are backed by a DNS service, add a DNS record mapping the hostnames and @@ -243,8 +249,11 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.ingress.gateway.hostname` | Hostname for API Manager Gateway | `gateway.am.wso2.com` | | `wso2.deployment.am.ingress.gateway.annotations` | Ingress resource annotations for API Manager Gateway | Community NGINX Ingress controller annotations | | `wso2.deployment.am.ingress.websub.enabled` | If enabled, create ingress resource for WebSub service | true | -| `wso2.deployment.am.ingress.websub.hostname` | Hostname for API Manager Gateway WebSub service | `gateway.am.wso2.com` | +| `wso2.deployment.am.ingress.websub.hostname` | Hostname for API Manager Gateway WebSub service | `websub.am.wso2.com` | | `wso2.deployment.am.ingress.websub.annotations` | Ingress resource annotations for API Manager Gateway WebSub | Community NGINX Ingress controller annotations | +| `wso2.deployment.am.ingress.websocket.enabled` | If enabled, create ingress resource for WebSocket service | true | +| `wso2.deployment.am.ingress.websocket.hostname` | Hostname for API Manager Gateway WebSocket service | `websocket.am.wso2.com` | +| `wso2.deployment.am.ingress.websocket.annotations` | Ingress resource annotations for API Manager Gateway WebSocket | Community NGINX Ingress controller annotations | **Note**: The above mentioned default, minimum resource amounts for running WSO2 API Manager server profiles are based on its [official documentation](https://apim.docs.wso2.com/en/4.1.0/install-and-setup/install/installation-prerequisites/). From b0e740079bdd7fa2deb9683374047a2f44abf797 Mon Sep 17 00:00:00 2001 From: pasant9 Date: Thu, 16 Mar 2023 10:29:21 +0530 Subject: [PATCH 3/4] Update CHANGELOG for 4.1.0-2 release --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb153f19..6d52dc51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,3 +18,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Ingress API version to networking.k8s.io/v1. - Readiness and liveness probe endpoints. + +## [v4.1.0.2] - 2023-03-16 + +### Added + +- Add ingress to handle WebSocket traffic + +### Modified + +- Update latest APIM configurations From bbeef87e0ec443a2bafacd1f198693e11ee86d81 Mon Sep 17 00:00:00 2001 From: pasant9 Date: Thu, 16 Mar 2023 10:30:22 +0530 Subject: [PATCH 4/4] Fix issues in jwks instructions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 451a731b..bb50273f 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The JWKS endpoint of the API Manager has an external facing hostname by default. 1. Log into Admin portal - https://am.wso2.com/admin/ 2. Navigate to Key Managers section and select the Resident Key Manager. -3. Change the JWKS URL in the Certificates section to https://:9443/oauth2/jwks. +3. Change the JWKS URL in the Certificates section to `https://:9443/oauth2/jwks`. ### Update certificate domain names