Merge pull request #2620 from CrowleyRajapakse/testbeta2

Adding helm chart changes to rc release
wso2 · Oct 25, 2024 · 31ea19e · 31ea19e
2 parents 8bf44b3 + 114d302
commit 31ea19e
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 35 deletions.
diff --git a/helm-charts/Chart.yaml b/helm-charts/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: apk-helm
 description: A Helm chart for APK components
 type: application
-version: 1.2.0-beta
+version: 1.2.0-rc
 appVersion: "1.2.0"
 dependencies:
   - name: postgresql

diff --git a/helm-charts/Version-Upgrade.md b/helm-charts/Version-Upgrade.md
@@ -1,24 +1,24 @@
 # Updating APK Version
 
-This guide outlines the process of upgrading from APK v1.0.0 installation to APK v1.1.0 installation.
+This guide outlines the process of upgrading from APK v1.1.0 installation to APK v1.2.0 installation.
 
 ## In-Place Upgrade
 
-The in-place upgrade process transitions your existing APK v1.0.0 installation to APK v1.1.0. Prior to implementing these steps in a production environment, it is advised to apply and validate them in lower environments.
+The in-place upgrade process transitions your existing APK v1.1.0 installation to APK v1.2.0. Prior to implementing these steps in a production environment, it is advised to apply and validate them in lower environments.
 
-- Ensure APK v1.0.0 is currently installed in the cluster.
+- Ensure APK v1.1.0 is currently installed in the cluster.
 
-    **Note:** The steps provided below assume that APK v1.0.0 is installed in the `default` namespace under the release name `apk`. Replace the dot (.) with the appropriate APK v1.1.0 Helm chart name and version, which is `wso2apk/apk-helm --version 1.1.0`.
+    **Note:** The steps provided below assume that APK v1.1.0 is installed in the `default` namespace under the release name `apk`. Replace the dot (.) with the appropriate APK v1.2.0 Helm chart name and version, which is `wso2apk/apk-helm --version 1.2.0`.
 
-- Install/Update CRDs for APK v1.1.0.
+- Install/Update CRDs for APK v1.2.0.
 
     ```bash
-    (helm template apk . -f crds-upgrade-values.yaml -n default && helm show crds .) > apk-v1.1.0-crds.yaml
+    (helm template apk . -f crds-upgrade-values.yaml -n default && helm show crds .) > apk-v1.2.0-crds.yaml
 
-    kubectl apply -f apk-v1.1.0-crds.yaml
+    kubectl apply -f apk-v1.2.0-crds.yaml
     ```
 
-- Upgrade the existing APK v1.0.0 installation to APK v1.1.0.
+- Upgrade the existing APK v1.1.0 installation to APK v1.2.0.
 
     ```bash
     helm upgrade --reuse-values apk . -f ./in-place-upgrade-values.yaml --set skipCrds=true

diff --git a/helm-charts/samples/apim-apk-agent/1.2.0-values.yaml b/helm-charts/samples/apim-apk-agent/1.2.0-values.yaml
@@ -17,7 +17,7 @@
 replicaCount: 1
 image:
   repository: wso2/apim-apk-agent
-  tag: 1.2.0-beta
+  tag: 1.2.0-rc
   pullPolicy: Always
 service:
   name: apim-apk-agent-service

diff --git a/helm-charts/samples/apim-apk-agent/cp/1.2.0-values.yaml b/helm-charts/samples/apim-apk-agent/cp/1.2.0-values.yaml
@@ -17,7 +17,7 @@
 replicaCount: 1
 image:
   repository: wso2/apim-apk-agent
-  tag: 1.2.0-beta
+  tag: 1.2.0-rc
   pullPolicy: Always
 service:
   name: apim-apk-agent-service

diff --git a/helm-charts/samples/apk/1.2.0-cp-enabled-values.yaml b/helm-charts/samples/apk/1.2.0-cp-enabled-values.yaml
@@ -19,6 +19,8 @@ wso2:
     imagePullSecrets: ""
 
   apk:
+    helmHooks:
+      webhooksCleanupEnabled: true
     webhooks:
       validatingwebhookconfigurations: true
       mutatingwebhookconfigurations: true
@@ -91,7 +93,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-config-deployer-service:1.2.0-beta
+          image: wso2/apk-config-deployer-service:1.2.0-rc
           # debug: true
           # configs:
           #   tls:
@@ -118,7 +120,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-adapter:1.2.0-beta
+          image: wso2/apk-adapter:1.2.0-rc
           security:
             sslHostname: "adapter"
           logging:
@@ -152,7 +154,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-common-controller:1.2.0-beta
+          image: wso2/apk-common-controller:1.2.0-rc
           security:
             sslHostname: "commoncontroller"
           # configs:
@@ -179,7 +181,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-ratelimiter:1.2.0-beta
+          image: wso2/apk-ratelimiter:1.2.0-rc
           security:
             sslHostname: "ratelimiter"
           # configs:
@@ -209,7 +211,7 @@ wso2:
               failureThreshold: 5
             strategy: RollingUpdate
             imagePullPolicy: Always
-            image: wso2/apk-router:1.2.0-beta
+            image: wso2/apk-router:1.2.0-rc
             # configs:
             #   tls:
             #     secretName: "router-cert"
@@ -240,7 +242,7 @@ wso2:
               failureThreshold: 5
             strategy: RollingUpdate
             imagePullPolicy: Always
-            image: wso2/apk-enforcer:1.2.0-beta
+            image: wso2/apk-enforcer:1.2.0-rc
             security:
               sslHostname: "enforcer"
             #            logging:
@@ -313,7 +315,7 @@ idp:
       strategy: RollingUpdate
       replicas: 1
       imagePullPolicy: Always
-      image: wso2/apk-idp-domain-service:1.2.0-beta
+      image: wso2/apk-idp-domain-service:1.2.0-rc
   idpui:
     deployment:
       resources:
@@ -334,7 +336,7 @@ idp:
       strategy: RollingUpdate
       replicas: 1
       imagePullPolicy: Always
-      image: wso2/apk-idp-ui:1.2.0-beta
+      image: wso2/apk-idp-ui:1.2.0-rc
     configs:
       idpLoginUrl: "https://idp.am.wso2.com:9095/commonauth/login"
       idpAuthCallBackUrl: "https://idp.am.wso2.com:9095/oauth2/auth-callback"

diff --git a/helm-charts/samples/apk/1.2.0-values.yaml b/helm-charts/samples/apk/1.2.0-values.yaml
@@ -19,6 +19,8 @@ wso2:
     imagePullSecrets: ""
 
   apk:
+    helmHooks:
+      webhooksCleanupEnabled: true
     webhooks:
       validatingwebhookconfigurations: true
       mutatingwebhookconfigurations: true
@@ -92,7 +94,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-config-deployer-service:1.2.0-beta
+          image: wso2/apk-config-deployer-service:1.2.0-rc
           # debug: true
           # configs:
           #   tls:
@@ -119,7 +121,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-adapter:1.2.0-beta
+          image: wso2/apk-adapter:1.2.0-rc
           security:
             sslHostname: "adapter"
           logging:
@@ -153,7 +155,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-common-controller:1.2.0-beta
+          image: wso2/apk-common-controller:1.2.0-rc
           security:
             sslHostname: "commoncontroller"
           # configs:
@@ -180,7 +182,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-ratelimiter:1.2.0-beta
+          image: wso2/apk-ratelimiter:1.2.0-rc
           security:
             sslHostname: "ratelimiter"
           # configs:
@@ -210,7 +212,7 @@ wso2:
               failureThreshold: 5
             strategy: RollingUpdate
             imagePullPolicy: Always
-            image: wso2/apk-router:1.2.0-beta
+            image: wso2/apk-router:1.2.0-rc
             # configs:
             #   tls:
             #     secretName: "router-cert"
@@ -241,7 +243,7 @@ wso2:
               failureThreshold: 5
             strategy: RollingUpdate
             imagePullPolicy: Always
-            image: wso2/apk-enforcer:1.2.0-beta
+            image: wso2/apk-enforcer:1.2.0-rc
             security:
               sslHostname: "enforcer"
     #            logging:
@@ -316,7 +318,7 @@ idp:
       strategy: RollingUpdate
       replicas: 1
       imagePullPolicy: Always
-      image: wso2/apk-idp-domain-service:1.2.0-beta
+      image: wso2/apk-idp-domain-service:1.2.0-rc
   idpui:
     deployment:
       resources:
@@ -337,7 +339,7 @@ idp:
       strategy: RollingUpdate
       replicas: 1
       imagePullPolicy: Always
-      image: wso2/apk-idp-ui:1.2.0-beta
+      image: wso2/apk-idp-ui:1.2.0-rc
     configs:
       idpLoginUrl: "https://idp.am.wso2.com:9095/commonauth/login"
       idpAuthCallBackUrl: "https://idp.am.wso2.com:9095/oauth2/auth-callback"

diff --git a/helm-charts/values.yaml b/helm-charts/values.yaml
@@ -96,7 +96,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-config-deployer-service:1.2.0-beta
+          image: wso2/apk-config-deployer-service:1.2.0-rc
         # debug: true
           # configs:
           #   tls:
@@ -123,7 +123,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-adapter:1.2.0-beta
+          image: wso2/apk-adapter:1.2.0-rc
           security:
             sslHostname: "adapter"
           logging:
@@ -157,7 +157,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-common-controller:1.2.0-beta
+          image: wso2/apk-common-controller:1.2.0-rc
           security:
             sslHostname: "commoncontroller"
           # configs:
@@ -184,7 +184,7 @@ wso2:
           strategy: RollingUpdate
           replicas: 1
           imagePullPolicy: Always
-          image: wso2/apk-ratelimiter:1.2.0-beta
+          image: wso2/apk-ratelimiter:1.2.0-rc
           security:
             sslHostname: "ratelimiter"
           # configs:
@@ -214,7 +214,7 @@ wso2:
               failureThreshold: 5
             strategy: RollingUpdate
             imagePullPolicy: Always
-            image: wso2/apk-router:1.2.0-beta
+            image: wso2/apk-router:1.2.0-rc
             # configs:
             #   tls:
             #     secretName: "router-cert"
@@ -245,7 +245,7 @@ wso2:
               failureThreshold: 5
             strategy: RollingUpdate
             imagePullPolicy: Always
-            image: wso2/apk-enforcer:1.2.0-beta
+            image: wso2/apk-enforcer:1.2.0-rc
             security:
               sslHostname: "enforcer"
 #            logging:
@@ -318,7 +318,7 @@ idp:
       strategy: RollingUpdate
       replicas: 1
       imagePullPolicy: Always
-      image: wso2/apk-idp-domain-service:1.2.0-beta
+      image: wso2/apk-idp-domain-service:1.2.0-rc
   idpui:
     deployment:
       resources:
@@ -339,7 +339,7 @@ idp:
       strategy: RollingUpdate
       replicas: 1
       imagePullPolicy: Always
-      image: wso2/apk-idp-ui:1.2.0-beta
+      image: wso2/apk-idp-ui:1.2.0-rc
     configs:
       idpLoginUrl: "https://idp.am.wso2.com:9095/commonauth/login"
       idpAuthCallBackUrl: "https://idp.am.wso2.com:9095/oauth2/auth-callback"