Merge pull request #2325 from CrowleyRajapakse/mymain

Changing helm chart to rc2
wso2 · Apr 8, 2024 · 990368b · 990368b
2 parents 86a74d9 + ee811fd
commit 990368b
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 1,593 deletions.
diff --git a/helm-charts/README.md b/helm-charts/README.md
@@ -1,6 +1,6 @@
 # apk-helm
 
-![Version: 1.1.0-rc](https://img.shields.io/badge/Version-1.1.0--rc-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+![Version: 1.1.0-rc2](https://img.shields.io/badge/Version-1.1.0--rc-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 A Helm chart for APK components
 
@@ -89,7 +89,7 @@ A Helm chart for APK components
 | wso2.apk.dp.configdeployer.deployment.strategy | string | `"RollingUpdate"` | Deployment strategy |
 | wso2.apk.dp.configdeployer.deployment.replicas | int | `1` | Number of replicas |
 | wso2.apk.dp.configdeployer.deployment.imagePullPolicy | string | `"Always"` | Image pull policy |
-| wso2.apk.dp.configdeployer.deployment.image | string | `"wso2/apk-config-deployer-service:1.1.0-beta"` | Image |
+| wso2.apk.dp.configdeployer.deployment.image | string | `"wso2/apk-config-deployer-service:1.1.0-rc2"` | Image |
 | wso2.apk.dp.configdeployer.deployment.configs.authorization | bool | `true` | Enable authorization for runtime api. |
 | wso2.apk.dp.configdeployer.deployment.configs.baseUrl | string | `"https://api.am.wso2.com:9095/api/runtime"` | Baseurl for runtime api. |
 | wso2.apk.dp.configdeployer.deployment.configs.tls.secretName | string | `""` | TLS secret name for runtime public certificate. |
@@ -109,7 +109,7 @@ A Helm chart for APK components
 | wso2.apk.dp.adapter.deployment.strategy | string | `"RollingUpdate"` | Deployment strategy |
 | wso2.apk.dp.adapter.deployment.replicas | int | `1` | Number of replicas |
 | wso2.apk.dp.adapter.deployment.imagePullPolicy | string | `"Always"` | Image pull policy |
-| wso2.apk.dp.adapter.deployment.image | string | `"wso2/apk-adapter:1.1.0-beta"` | Image |
+| wso2.apk.dp.adapter.deployment.image | string | `"wso2/apk-adapter:1.1.0-rc2"` | Image |
 | wso2.apk.dp.adapter.deployment.security.sslHostname | string | `"adapter"` | Enable security for adapter. |
 | wso2.apk.dp.adapter.deployment.affinity | object | `{"podAntiAffinity":{"preferredDuringSchedulingIgnoredDuringExecution":[{"podAffinityTerm":{"labelSelector":{"matchExpressions":[{"key":"app.kubernetes.io/app","operator":"In","values":["adapter"]}]}}}]}}` | Configure Affinity for the deployment.  |
 | wso2.apk.dp.adapter.deployment.nodeSelector | object | `{}` | Configure Node Selector for the deployment.  |
@@ -133,7 +133,7 @@ A Helm chart for APK components
 | wso2.apk.dp.commonController.deployment.strategy | string | `"RollingUpdate"` | Deployment strategy |
 | wso2.apk.dp.commonController.deployment.replicas | int | `1` | Number of replicas |
 | wso2.apk.dp.commonController.deployment.imagePullPolicy | string | `"Always"` | Image pull policy |
-| wso2.apk.dp.commonController.deployment.image | string | `"wso2/apk-common-controller:1.1.0-beta"` | Image |
+| wso2.apk.dp.commonController.deployment.image | string | `"wso2/apk-common-controller:1.1.0-rc2"` | Image |
 | wso2.apk.dp.commonController.deployment.security.sslHostname | string | `"commoncontroller"` | hostname for the common controller |
 | wso2.apk.dp.commonController.deployment.configs.apiNamespaces | list | `["apk-v12"]` | Optionally configure namespaces to watch for apis,ratelimitpolicies,etc. |
 | wso2.apk.dp.commonController.deployment.affinity | object | `{"podAntiAffinity":{"preferredDuringSchedulingIgnoredDuringExecution":[{"podAffinityTerm":{"labelSelector":{"matchExpressions":[{"key":"app.kubernetes.io/app","operator":"In","values":["common-controller"]}]}}}]}}` | Configure Affinity for the deployment.  |
@@ -175,7 +175,7 @@ A Helm chart for APK components
 | wso2.apk.dp.ratelimiter.deployment.strategy | string | `"RollingUpdate"` | Deployment strategy |
 | wso2.apk.dp.ratelimiter.deployment.replicas | int | `1` | Number of replicas |
 | wso2.apk.dp.ratelimiter.deployment.imagePullPolicy | string | `"Always"` | Image pull policy |
-| wso2.apk.dp.ratelimiter.deployment.image | string | `"wso2/apk-ratelimiter:1.1.0-beta"` | Image |
+| wso2.apk.dp.ratelimiter.deployment.image | string | `"wso2/apk-ratelimiter:1.1.0-rc2"` | Image |
 | wso2.apk.dp.ratelimiter.deployment.security.sslHostname | string | `"ratelimiter"` | hostname for the rate limiter |
 | wso2.apk.dp.ratelimiter.deployment.configs.tls.secretName | string | `"ratelimiter-cert"` | TLS secret name for rate limiter public certificate. |
 | wso2.apk.dp.ratelimiter.deployment.configs.tls.certKeyFilename | string | `""` | TLS certificate file name. |
@@ -199,7 +199,7 @@ A Helm chart for APK components
 | wso2.apk.dp.gatewayRuntime.deployment.router.livenessProbe.failureThreshold | int | `5` | Minimum consecutive failures for the probe to be considered failed after having succeeded. |
 | wso2.apk.dp.gatewayRuntime.deployment.router.strategy | string | `"RollingUpdate"` | Deployment strategy |
 | wso2.apk.dp.gatewayRuntime.deployment.router.imagePullPolicy | string | `"Always"` | Image pull policy |
-| wso2.apk.dp.gatewayRuntime.deployment.router.image | string | `"wso2/apk-router:1.1.0-beta"` | Image |
+| wso2.apk.dp.gatewayRuntime.deployment.router.image | string | `"wso2/apk-router:1.1.0-rc2"` | Image |
 | wso2.apk.dp.gatewayRuntime.deployment.router.configs.enforcerResponseTimeoutInSeconds | int | `20` | The timeout for response coming from enforcer to route per API request |
 | wso2.apk.dp.gatewayRuntime.deployment.router.configs.useRemoteAddress | bool | `false` | If configured true, router appends the immediate downstream ip address to the x-forward-for header |
 | wso2.apk.dp.gatewayRuntime.deployment.router.configs.systemHost | string | `"localhost"` | System hostname for system API resources (eg: /testkey and /health) |
@@ -227,7 +227,7 @@ A Helm chart for APK components
 | wso2.apk.dp.gatewayRuntime.deployment.enforcer.livenessProbe.failureThreshold | int | `5` | Minimum consecutive failures for the probe to be considered failed after having succeeded. |
 | wso2.apk.dp.gatewayRuntime.deployment.enforcer.strategy | string | `"RollingUpdate"` | Deployment strategy |
 | wso2.apk.dp.gatewayRuntime.deployment.enforcer.imagePullPolicy | string | `"Always"` | Image pull policy |
-| wso2.apk.dp.gatewayRuntime.deployment.enforcer.image | string | `"wso2/apk-enforcer:1.1.0-beta"` | Image |
+| wso2.apk.dp.gatewayRuntime.deployment.enforcer.image | string | `"wso2/apk-enforcer:1.1.0-rc2"` | Image |
 | wso2.apk.dp.gatewayRuntime.deployment.enforcer.security.sslHostname | string | `"enforcer"` | hostname for the enforcer |
 | wso2.apk.dp.gatewayRuntime.deployment.enforcer.configs.tls.secretName | string | `""` | TLS secret name for enforcer public certificate. |
 | wso2.apk.dp.gatewayRuntime.deployment.enforcer.configs.tls.certKeyFilename | string | `""` | TLS certificate file name. |
@@ -311,7 +311,7 @@ A Helm chart for APK components
 | idp.idpds.deployment.strategy | string | `"RollingUpdate"` | Deployment strategy |
 | idp.idpds.deployment.replicas | int | `1` | Number of replicas |
 | idp.idpds.deployment.imagePullPolicy | string | `"Always"` | Image pull policy |
-| idp.idpds.deployment.image | string | `"wso2/apk-idp-domain-service:1.1.0-beta"` | Image |
+| idp.idpds.deployment.image | string | `"wso2/apk-idp-domain-service:1.1.0-rc2"` | Image |
 | idp.idpui.deployment.resources.requests.memory | string | `"128Mi"` | CPU request for the container |
 | idp.idpui.deployment.resources.requests.cpu | string | `"100m"` | Memory request for the container |
 | idp.idpui.deployment.resources.limits.memory | string | `"1028Mi"` | CPU limit for the container |
@@ -325,7 +325,7 @@ A Helm chart for APK components
 | idp.idpui.deployment.strategy | string | `"RollingUpdate"` | Deployment strategy |
 | idp.idpui.deployment.replicas | int | `1` | Number of replicas |
 | idp.idpui.deployment.imagePullPolicy | string | `"Always"` | Image pull policy |
-| idp.idpui.deployment.image | string | `"wso2/apk-idp-ui:1.1.0-beta"` | Image |
+| idp.idpui.deployment.image | string | `"wso2/apk-idp-ui:1.1.0-rc2"` | Image |
 | idp.idpui.configs.idpLoginUrl | string | `"https://idp.am.wso2.com:9095/commonauth/login"` | identity server Login URL |
 | idp.idpui.configs.idpAuthCallBackUrl | string | `"https://idp.am.wso2.com:9095/oauth2/auth-callback"` | identity server authCallBackUrl |
 | gatewaySystem.enabled | bool | `true` | Enable gateway system to install gateway system components |

diff --git a/helm-charts/samples/apim-apk-agent/cp/values.yaml b/helm-charts/samples/apim-apk-agent/cp/values.yaml
@@ -17,11 +17,17 @@
 replicaCount: 1
 image:
   repository: wso2/apim-apk-agent
-  tag: 1.1.0-rc
+  tag: 1.1.0-rc2
   pullPolicy: Always
 service:
   name: apim-apk-agent-service
-resources: {}
+resources:
+  requests:
+    memory: "128Mi"
+    cpu: "100m"
+  limits:
+    memory: "256Mi"
+    cpu: "200m"
 controlPlane:
   enabled: true
   serviceURL: https://apim-wso2am-cp-1-service.apk.svc.cluster.local:9443/
@@ -39,4 +45,9 @@ metrics:
 agent:
   mode: DPtoCP
 certmanager:
-  enabled: true
+  enabled: false
+serviceAccount:
+  enableServiceAccountCreation: true
+  enableClusterRoleCreation: true
+  serviceAccountName: wso2agent-platform
+  roleName: wso2agent-role
diff --git a/helm-charts/samples/apim-apk-agent/values.yaml b/helm-charts/samples/apim-apk-agent/values.yaml
@@ -17,11 +17,17 @@
 replicaCount: 1
 image:
   repository: wso2/apim-apk-agent
-  tag: 1.1.0-rc
+  tag: 1.1.0-rc2
   pullPolicy: Always
 service:
   name: apim-apk-agent-service
-resources: {}
+resources:
+  requests:
+    memory: "128Mi"
+    cpu: "100m"
+  limits:
+    memory: "256Mi"
+    cpu: "200m"
 controlPlane:
   enabled: true
   serviceURL: https://apim-wso2am-cp-1-service.apk.svc.cluster.local:9443/
@@ -40,4 +46,9 @@ metrics:
 agent:
   mode: CPtoDP
 certmanager:
-  enabled: true
+  enabled: false
+serviceAccount:
+  enableServiceAccountCreation: true
+  enableClusterRoleCreation: true
+  serviceAccountName: wso2agent-platform
+  roleName: wso2agent-role