Merge pull request #291 from RidmiR/5.11.0

Merge 5.11.0.x with Master
wso2 · Mar 3, 2021 · fab3bff · fab3bff
2 parents 4b39629 + 7aecc26
commit fab3bff
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git 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,9 @@ 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
@@ -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
@@ -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
@@ -57,7 +57,8 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository]
  **Helm version 2**
 
  ```
- helm install --name <RELEASE_NAME> wso2/is-pattern-1 --version 5.11.0-2 --namespace <NAMESPACE>
+ helm install --name <RELEASE_NAME> wso2/is-pattern-1 --version 5.11.0-3 --namespace <NAMESPACE>
+
  ```
 
  **Helm version 3**
@@ -71,7 +72,7 @@ You can install the relevant Helm chart either from [WSO2 Helm Chart Repository]
  - Deploy the Kubernetes resources using the Helm Chart
  
     ```
-    helm install <RELEASE_NAME> wso2/is-pattern-1 --version 5.11.0-2 --namespace <NAMESPACE>
+    helm install <RELEASE_NAME> wso2/is-pattern-1 --version 5.11.0-3 --namespace <NAMESPACE>
     ```
 
 The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub.
@@ -82,7 +83,7 @@ please provide your WSO2 Subscription Credentials via input values (using `--set
 Refer the following example.
 
 ```
- helm install --name <RELEASE_NAME> wso2/is-pattern-1 --version 5.11.0-2 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
+ helm install --name <RELEASE_NAME> wso2/is-pattern-1 --version 5.11.0-3 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
 ```
 
 #### Install Chart From Source
@@ -103,7 +104,7 @@ git clone https://github.com/wso2/kubernetes-is.git
  **Helm version 2**
 
  ```
- helm install --dep-up --name <RELEASE_NAME> <HELM_HOME>/is-pattern-1 --version 5.11.0-2 --namespace <NAMESPACE>
+ helm install --dep-up --name <RELEASE_NAME> <HELM_HOME>/is-pattern-1 --version 5.11.0-3 --namespace <NAMESPACE>
  ```
 
  **Helm version 3**
@@ -117,7 +118,7 @@ git clone https://github.com/wso2/kubernetes-is.git
  - Deploy the Kubernetes resources using the Helm Chart
  
     ```
-    helm install <RELEASE_NAME> <HELM_HOME>/is-pattern-1 --version 5.11.0-2 --namespace <NAMESPACE> --dependency-update
+    helm install <RELEASE_NAME> <HELM_HOME>/is-pattern-1 --version 5.11.0-3 --namespace <NAMESPACE> --dependency-update
     ```
 
 The above steps will deploy the deployment pattern using WSO2 product Docker images available at DockerHub.
@@ -128,7 +129,7 @@ please provide your WSO2 Subscription Credentials via input values (using `--set
 Refer the following example.
 
 ```
- helm install --name <RELEASE_NAME> <HELM_HOME>/is-pattern-1 --version 5.11.0-2 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
+ helm install --name <RELEASE_NAME> <HELM_HOME>/is-pattern-1 --version 5.11.0-3 --namespace <NAMESPACE> --set wso2.subscription.username=<SUBSCRIPTION_USERNAME> --set wso2.subscription.password=<SUBSCRIPTION_PASSWORD>
 ```
 
 ### 2. Obtain the external IP

diff --git 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
diff --git a/advanced/is-pattern-1/templates/_helpers.tpl b/advanced/is-pattern-1/templates/_helpers.tpl
@@ -64,6 +64,7 @@ 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 "") -}}