From b533977c85e180f2c63c378f8261e29e2b0896b3 Mon Sep 17 00:00:00 2001 From: Aaquiff Date: Thu, 3 Dec 2020 17:35:09 +0530 Subject: [PATCH 1/9] Use update 2 images when subscription is enabled. --- advanced/is-pattern-1/templates/_helpers.tpl | 16 ++++++++++++++++ ...is-pattern-1-identity-server-statefulset.yaml | 10 +--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/advanced/is-pattern-1/templates/_helpers.tpl b/advanced/is-pattern-1/templates/_helpers.tpl index 8a7adcf8..b27a53c6 100644 --- a/advanced/is-pattern-1/templates/_helpers.tpl +++ b/advanced/is-pattern-1/templates/_helpers.tpl @@ -63,3 +63,19 @@ Common prefix prepended to Kubernetes resources of this chart {{- define "is-pattern-1.resource.prefix" -}} {{- "wso2is-pattern-1" }} {{- end -}} + +{{- define "image" }} +{{- $dockerRegistry := .deployment.dockerRegistry | default "wso2" }} +{{- $imageName := .deployment.imageName }} +{{- $imageTag := .deployment.imageTag }} +{{ if or (eq .Values.wso2.subscription.username "") (eq .Values.wso2.subscription.password "") -}} +image: {{ $dockerRegistry }}/{{ $imageName }}{{- if not (eq $imageTag "") }}{{- printf ":%s" $imageTag -}}{{- end }} +{{- else -}} +{{ $parts := len (split "." $imageTag) -}} +{{ if eq $parts 3 -}} +image: docker.wso2.com/{{ $imageName }}:{{ $imageTag }}.0 +{{- else -}} +image: docker.wso2.com/{{ $imageName }}:{{ $imageTag }} +{{- end -}} +{{- end -}} +{{- end -}} diff --git a/advanced/is-pattern-1/templates/is/wso2is-pattern-1-identity-server-statefulset.yaml b/advanced/is-pattern-1/templates/is/wso2is-pattern-1-identity-server-statefulset.yaml index 60a540cf..710e9996 100755 --- a/advanced/is-pattern-1/templates/is/wso2is-pattern-1-identity-server-statefulset.yaml +++ b/advanced/is-pattern-1/templates/is/wso2is-pattern-1-identity-server-statefulset.yaml @@ -74,15 +74,7 @@ spec: {{ end }} containers: - name: identity-server - {{ if .Values.wso2.deployment.wso2is.dockerRegistry }} - image: {{ .Values.wso2.deployment.wso2is.dockerRegistry }}/{{ .Values.wso2.deployment.wso2is.imageName }} - {{- $tag := .Values.wso2.deployment.wso2is.imageTag }} - {{- if not (eq $tag "") }}{{- printf ":%s" $tag -}}{{- end }} - {{ else if or (eq .Values.wso2.subscription.username "") (eq .Values.wso2.subscription.password "") }} - image: wso2/{{ .Values.wso2.deployment.wso2is.imageName }}:{{ .Values.wso2.deployment.wso2is.imageTag }} - {{ else }} - image: docker.wso2.com/{{ .Values.wso2.deployment.wso2is.imageName }}:{{ .Values.wso2.deployment.wso2is.imageTag }} - {{ end }} +{{- include "image" (dict "Values" .Values "deployment" .Values.wso2.deployment.wso2is) | indent 10 }} imagePullPolicy: {{ .Values.wso2.deployment.wso2is.imagePullPolicy }} env: - name: NODE_IP From 319826de2bca68ac90018de39f282147db5973e5 Mon Sep 17 00:00:00 2001 From: Aaquiff Date: Thu, 3 Dec 2020 17:35:09 +0530 Subject: [PATCH 2/9] Use update 2 images when subscription is enabled. --- advanced/is-pattern-1/templates/_helpers.tpl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/advanced/is-pattern-1/templates/_helpers.tpl b/advanced/is-pattern-1/templates/_helpers.tpl index b27a53c6..b4b7ec90 100644 --- a/advanced/is-pattern-1/templates/_helpers.tpl +++ b/advanced/is-pattern-1/templates/_helpers.tpl @@ -64,18 +64,18 @@ Common prefix prepended to Kubernetes resources of this chart {{- "wso2is-pattern-1" }} {{- end -}} -{{- define "image" }} -{{- $dockerRegistry := .deployment.dockerRegistry | default "wso2" }} {{- $imageName := .deployment.imageName }} -{{- $imageTag := .deployment.imageTag }} -{{ if or (eq .Values.wso2.subscription.username "") (eq .Values.wso2.subscription.password "") -}} +{{- $imageTag := .deployment.imageTag | default "" }} +{{- if or (eq .Values.wso2.subscription.username "") (eq .Values.wso2.subscription.password "") -}} +{{- $dockerRegistry := .deployment.dockerRegistry | default "wso2" }} image: {{ $dockerRegistry }}/{{ $imageName }}{{- if not (eq $imageTag "") }}{{- printf ":%s" $imageTag -}}{{- end }} -{{- else -}} -{{ $parts := len (split "." $imageTag) -}} -{{ if eq $parts 3 -}} -image: docker.wso2.com/{{ $imageName }}:{{ $imageTag }}.0 -{{- else -}} -image: docker.wso2.com/{{ $imageName }}:{{ $imageTag }} +{{- else }} +{{- $dockerRegistry := .deployment.dockerRegistry | default "docker.wso2.com" }} +{{- $parts := len (split "." $imageTag) }} +{{- if eq $parts 3 }} +image: {{ $dockerRegistry }}/{{ $imageName }}{{- if not (eq $imageTag "") }}:{{ $imageTag }}.0{{- end }} +{{- else }} +image: {{ $dockerRegistry }}/{{ $imageName }}{{- if not (eq $imageTag "") }}:{{ $imageTag }}{{- end }} {{- end -}} {{- end -}} {{- end -}} From aa34d8912033bc8e836b524658fdafb93c6db450 Mon Sep 17 00:00:00 2001 From: Aaquiff Date: Mon, 14 Dec 2020 19:17:56 +0530 Subject: [PATCH 3/9] Fix incorrect properties in serviceMonitor --- ...pattern-1-identity-server-prometheus-serviceMonitor.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/advanced/is-pattern-1/templates/prometheus/wso2is-pattern-1-identity-server-prometheus-serviceMonitor.yaml b/advanced/is-pattern-1/templates/prometheus/wso2is-pattern-1-identity-server-prometheus-serviceMonitor.yaml index 02aca5c4..ae2a1b37 100644 --- a/advanced/is-pattern-1/templates/prometheus/wso2is-pattern-1-identity-server-prometheus-serviceMonitor.yaml +++ b/advanced/is-pattern-1/templates/prometheus/wso2is-pattern-1-identity-server-prometheus-serviceMonitor.yaml @@ -26,11 +26,11 @@ spec: selector: matchLabels: deployment: wso2is - Namespace Selector: - Match Names: + namespaceSelector: + matchNames: - {{ .Release.Namespace }} endpoints: - port: metrics interval: 1s - Path: /metrics + path: /metrics {{ end }} From 4c73130ca47cb13ae34e3e281dd2411cfce78848 Mon Sep 17 00:00:00 2001 From: Aaquiff Date: Thu, 17 Dec 2020 17:07:53 +0530 Subject: [PATCH 4/9] Prepare for relase 5.11.0.2 --- CHANGELOG.md | 9 ++++++++- README.md | 2 +- advanced/databases/mysql-is/Chart.yaml | 2 +- advanced/is-pattern-1/Chart.yaml | 2 +- advanced/is-pattern-1/README.md | 12 ++++++------ advanced/is-pattern-1/requirements.yaml | 2 +- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f42932d4..7b22ab37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to Kubernetes and Helm resources for WSO2 IAM version `5.11. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +## [v5.11.0.2] - 2020.12.17 + +### Changed + +- Use update 2 images when subscription is enabled (refer [issue](https://github.com/wso2/kubernetes-is/issues/280) ). + ## [v5.11.0.1] - 2020.12.03 ### Added @@ -12,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Introduce Helm chart for WSO2 IAM version `5.11.0` deployment pattern 1 For detailed information on the tasks carried out during this release, please see the GitHub milestone -[v5.11.0.1](https://github.com/wso2/kubernetes-is/milestone/10). +[v5.11.0.2](https://github.com/wso2/kubernetes-is/milestone/11). [v5.11.0.1]: https://github.com/wso2/kubernetes-is/compare/v5.10.0.2...v5.11.0.1 +[v5.11.0.2]: https://github.com/wso2/kubernetes-is/compare/v5.11.0.1...v5.11.0.2 diff --git a/README.md b/README.md index c524c16c..0521f8c5 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,4 @@ given below: ## Changelog -**Change log** from previous v5.10.0.2 release: [View Here](CHANGELOG.md) +**Change log** from previous release: [View Here](CHANGELOG.md) diff --git a/advanced/databases/mysql-is/Chart.yaml b/advanced/databases/mysql-is/Chart.yaml index 248bfd1c..eb03bb35 100755 --- a/advanced/databases/mysql-is/Chart.yaml +++ b/advanced/databases/mysql-is/Chart.yaml @@ -15,5 +15,5 @@ apiVersion: v1 appVersion: "5.7" description: A Helm chart for MySQL based deployment of WSO2 Identity And Access Management Datasources name: mysql-is -version: 5.11.0-1 +version: 5.11.0-2 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/is-pattern-1/Chart.yaml b/advanced/is-pattern-1/Chart.yaml index 932ca411..18d822ad 100755 --- a/advanced/is-pattern-1/Chart.yaml +++ b/advanced/is-pattern-1/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 appVersion: "5.11.0" description: A Helm chart for the deployment of WSO2 Identity And Access Management pattern 1 name: is-pattern-1 -version: 5.11.0-1 +version: 5.11.0-2 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/is-pattern-1/README.md b/advanced/is-pattern-1/README.md index ced2d53e..89037f1f 100644 --- a/advanced/is-pattern-1/README.md +++ b/advanced/is-pattern-1/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/is-pattern-1 --version 5.11.0-1 --namespace + helm install --name wso2/is-pattern-1 --version 5.11.0-2 --namespace ``` **Helm version 3** @@ -71,7 +71,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/is-pattern-1 --version 5.11.0-1 --namespace + helm install wso2/is-pattern-1 --version 5.11.0-2 --namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -82,7 +82,7 @@ please provide your WSO2 Subscription Credentials via input values (using `--set Refer the following example. ``` - helm install --name wso2/is-pattern-1 --version 5.11.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name wso2/is-pattern-1 --version 5.11.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` #### Install Chart From Source @@ -103,7 +103,7 @@ git clone https://github.com/wso2/kubernetes-is.git **Helm version 2** ``` - helm install --dep-up --name /is-pattern-1 --version 5.11.0-1 --namespace + helm install --dep-up --name /is-pattern-1 --version 5.11.0-2 --namespace ``` **Helm version 3** @@ -117,7 +117,7 @@ git clone https://github.com/wso2/kubernetes-is.git - Deploy the Kubernetes resources using the Helm Chart ``` - helm install /is-pattern-1 --version 5.11.0-1 --namespace --dependency-update + helm install /is-pattern-1 --version 5.11.0-2 --namespace --dependency-update ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -128,7 +128,7 @@ please provide your WSO2 Subscription Credentials via input values (using `--set Refer the following example. ``` - helm install --name /is-pattern-1 --version 5.11.0-1 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name /is-pattern-1 --version 5.11.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` ### 2. Obtain the external IP diff --git a/advanced/is-pattern-1/requirements.yaml b/advanced/is-pattern-1/requirements.yaml index 6ad69cd5..dc3a3b66 100644 --- a/advanced/is-pattern-1/requirements.yaml +++ b/advanced/is-pattern-1/requirements.yaml @@ -13,6 +13,6 @@ # limitations under the License. dependencies: - name: mysql-is - version: "5.11.0-1" + version: "5.11.0-2" repository: "https://helm.wso2.com" condition: wso2.mysql.enabled From c52b5bdef29a2f87e9dec73546eb894a41edf7ca Mon Sep 17 00:00:00 2001 From: Aaquiff Date: Thu, 17 Dec 2020 18:46:21 +0530 Subject: [PATCH 5/9] Change mysql dependency to bitnami repo --- advanced/databases/mysql-is/requirements.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/advanced/databases/mysql-is/requirements.yaml b/advanced/databases/mysql-is/requirements.yaml index 6a03faf3..814376ba 100644 --- a/advanced/databases/mysql-is/requirements.yaml +++ b/advanced/databases/mysql-is/requirements.yaml @@ -13,5 +13,5 @@ # limitations under the License. dependencies: - name: mysql - version: "1.6.6" - repository: "https://kubernetes-charts.storage.googleapis.com" + version: "8.2.3" + repository: "https://charts.bitnami.com/bitnami" From c255e37d44eadc2d0e6ba3aefc17b44df055b3bb Mon Sep 17 00:00:00 2001 From: RidmiR Date: Tue, 2 Mar 2021 20:11:07 +0530 Subject: [PATCH 6/9] Fix templete issue --- advanced/is-pattern-1/templates/_helpers.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/advanced/is-pattern-1/templates/_helpers.tpl b/advanced/is-pattern-1/templates/_helpers.tpl index b4b7ec90..27b3bf34 100644 --- a/advanced/is-pattern-1/templates/_helpers.tpl +++ b/advanced/is-pattern-1/templates/_helpers.tpl @@ -64,6 +64,8 @@ Common prefix prepended to Kubernetes resources of this chart {{- "wso2is-pattern-1" }} {{- end -}} + +{{- define "image" -}} {{- $imageName := .deployment.imageName }} {{- $imageTag := .deployment.imageTag | default "" }} {{- if or (eq .Values.wso2.subscription.username "") (eq .Values.wso2.subscription.password "") -}} From 0798cbb93b2dd4508867a58d60f408119d28452e Mon Sep 17 00:00:00 2001 From: RidmiR Date: Tue, 2 Mar 2021 20:11:55 +0530 Subject: [PATCH 7/9] Fix templete issue --- advanced/is-pattern-1/templates/_helpers.tpl | 1 - 1 file changed, 1 deletion(-) diff --git a/advanced/is-pattern-1/templates/_helpers.tpl b/advanced/is-pattern-1/templates/_helpers.tpl index 27b3bf34..4d6301e5 100644 --- a/advanced/is-pattern-1/templates/_helpers.tpl +++ b/advanced/is-pattern-1/templates/_helpers.tpl @@ -64,7 +64,6 @@ Common prefix prepended to Kubernetes resources of this chart {{- "wso2is-pattern-1" }} {{- end -}} - {{- define "image" -}} {{- $imageName := .deployment.imageName }} {{- $imageTag := .deployment.imageTag | default "" }} From a64e4758f461e00580772f5787e05c97acddec3e Mon Sep 17 00:00:00 2001 From: RidmiR Date: Wed, 3 Mar 2021 11:34:41 +0530 Subject: [PATCH 8/9] Fix templete issue --- CHANGELOG.md | 9 ++++++++- advanced/databases/mysql-is/Chart.yaml | 2 +- advanced/is-pattern-1/Chart.yaml | 2 +- advanced/is-pattern-1/README.md | 12 ++++++------ advanced/is-pattern-1/requirements.yaml | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b22ab37..b70552a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to Kubernetes and Helm resources for WSO2 IAM version `5.11. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) +## [v5.11.0.3] - 2021.03.03 + +### Changed + +- Fix is-pattern-1 template issue (refer [issue](https://github.com/wso2/kubernetes-is/issues/288) ). + ## [v5.11.0.2] - 2020.12.17 ### Changed @@ -18,7 +24,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Introduce Helm chart for WSO2 IAM version `5.11.0` deployment pattern 1 For detailed information on the tasks carried out during this release, please see the GitHub milestone -[v5.11.0.2](https://github.com/wso2/kubernetes-is/milestone/11). +[v5.11.0.3](https://github.com/wso2/kubernetes-is/milestone/12). [v5.11.0.1]: https://github.com/wso2/kubernetes-is/compare/v5.10.0.2...v5.11.0.1 [v5.11.0.2]: https://github.com/wso2/kubernetes-is/compare/v5.11.0.1...v5.11.0.2 +[v5.11.0.3]: https://github.com/wso2/kubernetes-is/compare/v5.11.0.2...v5.11.0.3 diff --git a/advanced/databases/mysql-is/Chart.yaml b/advanced/databases/mysql-is/Chart.yaml index eb03bb35..e4f892b3 100755 --- a/advanced/databases/mysql-is/Chart.yaml +++ b/advanced/databases/mysql-is/Chart.yaml @@ -15,5 +15,5 @@ apiVersion: v1 appVersion: "5.7" description: A Helm chart for MySQL based deployment of WSO2 Identity And Access Management Datasources name: mysql-is -version: 5.11.0-2 +version: 5.11.0-3 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/is-pattern-1/Chart.yaml b/advanced/is-pattern-1/Chart.yaml index 18d822ad..99a1ae8e 100755 --- a/advanced/is-pattern-1/Chart.yaml +++ b/advanced/is-pattern-1/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 appVersion: "5.11.0" description: A Helm chart for the deployment of WSO2 Identity And Access Management pattern 1 name: is-pattern-1 -version: 5.11.0-2 +version: 5.11.0-3 icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg diff --git a/advanced/is-pattern-1/README.md b/advanced/is-pattern-1/README.md index 89037f1f..92a2c3e6 100644 --- a/advanced/is-pattern-1/README.md +++ b/advanced/is-pattern-1/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/is-pattern-1 --version 5.11.0-2 --namespace + helm install --name wso2/is-pattern-1 --version 5.11.0-3 --namespace ``` **Helm version 3** @@ -71,7 +71,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/is-pattern-1 --version 5.11.0-2 --namespace + helm install wso2/is-pattern-1 --version 5.11.0-3 --namespace ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -82,7 +82,7 @@ please provide your WSO2 Subscription Credentials via input values (using `--set Refer the following example. ``` - helm install --name wso2/is-pattern-1 --version 5.11.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name wso2/is-pattern-1 --version 5.11.0-3 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` #### Install Chart From Source @@ -103,7 +103,7 @@ git clone https://github.com/wso2/kubernetes-is.git **Helm version 2** ``` - helm install --dep-up --name /is-pattern-1 --version 5.11.0-2 --namespace + helm install --dep-up --name /is-pattern-1 --version 5.11.0-3 --namespace ``` **Helm version 3** @@ -117,7 +117,7 @@ git clone https://github.com/wso2/kubernetes-is.git - Deploy the Kubernetes resources using the Helm Chart ``` - helm install /is-pattern-1 --version 5.11.0-2 --namespace --dependency-update + helm install /is-pattern-1 --version 5.11.0-3 --namespace --dependency-update ``` The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub. @@ -128,7 +128,7 @@ please provide your WSO2 Subscription Credentials via input values (using `--set Refer the following example. ``` - helm install --name /is-pattern-1 --version 5.11.0-2 --namespace --set wso2.subscription.username= --set wso2.subscription.password= + helm install --name /is-pattern-1 --version 5.11.0-3 --namespace --set wso2.subscription.username= --set wso2.subscription.password= ``` ### 2. Obtain the external IP diff --git a/advanced/is-pattern-1/requirements.yaml b/advanced/is-pattern-1/requirements.yaml index dc3a3b66..178fd2c9 100644 --- a/advanced/is-pattern-1/requirements.yaml +++ b/advanced/is-pattern-1/requirements.yaml @@ -13,6 +13,6 @@ # limitations under the License. dependencies: - name: mysql-is - version: "5.11.0-2" + version: "5.11.0-3" repository: "https://helm.wso2.com" condition: wso2.mysql.enabled From 7aecc26db4519bc89f70a1bdd5d82a9ae72babb4 Mon Sep 17 00:00:00 2001 From: RidmiR Date: Wed, 3 Mar 2021 14:25:31 +0530 Subject: [PATCH 9/9] Fix templete issue --- advanced/databases/mysql-is/Chart.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/advanced/databases/mysql-is/Chart.yaml b/advanced/databases/mysql-is/Chart.yaml index 66478699..e4f892b3 100755 --- a/advanced/databases/mysql-is/Chart.yaml +++ b/advanced/databases/mysql-is/Chart.yaml @@ -15,9 +15,5 @@ apiVersion: v1 appVersion: "5.7" description: A Helm chart for MySQL based deployment of WSO2 Identity And Access Management Datasources name: mysql-is -<<<<<<< HEAD version: 5.11.0-3 -======= -version: 5.11.0-2 ->>>>>>> c52b5bdef29a2f87e9dec73546eb894a41edf7ca icon: https://wso2.cachefly.net/wso2/sites/all/images/wso2logo.svg