diff --git a/helm-charts/Chart.yaml b/helm-charts/Chart.yaml index 5f4ebe54d7..8eec0ae42b 100644 --- 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.1.0-rc +version: 1.1.0-rc2 appVersion: "1.16.0" dependencies: - name: postgresql diff --git a/helm-charts/README.md b/helm-charts/README.md index 2e7b887cec..268a8a0ca8 100644 --- 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 index e74cbb9eb1..f5286a23f2 100644 --- 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 \ No newline at end of file + 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 index afd8f0f4e8..0d95cca34d 100644 --- 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 diff --git a/helm-charts/samples/apk/cp-enabled-values.yaml b/helm-charts/samples/apk/cp-enabled-values.yaml index 7fa3368a6e..b93fec74ab 100644 --- a/helm-charts/samples/apk/cp-enabled-values.yaml +++ b/helm-charts/samples/apk/cp-enabled-values.yaml @@ -116,7 +116,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-adapter:1.1.0-rc + image: wso2/apk-adapter:1.1.0-rc2 security: sslHostname: "adapter" # logging: @@ -149,7 +149,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-common-controller:1.1.0-rc + image: wso2/apk-common-controller:1.1.0-rc2 security: sslHostname: "commoncontroller" # configs: @@ -176,7 +176,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-ratelimiter:1.1.0-rc + image: wso2/apk-ratelimiter:1.1.0-rc2 security: sslHostname: "ratelimiter" # configs: @@ -206,7 +206,7 @@ wso2: failureThreshold: 5 strategy: RollingUpdate imagePullPolicy: Always - image: wso2/apk-router:1.1.0-rc + image: wso2/apk-router:1.1.0-rc2 # configs: # tls: # secretName: "router-cert" @@ -237,7 +237,7 @@ wso2: failureThreshold: 5 strategy: RollingUpdate imagePullPolicy: Always - image: wso2/apk-enforcer:1.1.0-rc + image: wso2/apk-enforcer:1.1.0-rc2 security: sslHostname: "enforcer" # logging: @@ -309,7 +309,7 @@ idp: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-idp-domain-service:1.1.0-rc + image: wso2/apk-idp-domain-service:1.1.0-rc2 idpui: deployment: resources: @@ -330,7 +330,7 @@ idp: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-idp-ui:1.1.0-rc + image: wso2/apk-idp-ui:1.1.0-rc2 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/values.yaml b/helm-charts/samples/apk/values.yaml index cb25161e7b..368bded8b0 100644 --- a/helm-charts/samples/apk/values.yaml +++ b/helm-charts/samples/apk/values.yaml @@ -91,7 +91,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-config-deployer-service:1.1.0-rc + image: wso2/apk-config-deployer-service:1.1.0-rc2 # configs: # tls: # secretName: "my-secret" @@ -117,7 +117,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-adapter:1.1.0-rc + image: wso2/apk-adapter:1.1.0-rc2 security: sslHostname: "adapter" # logging: @@ -150,7 +150,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-common-controller:1.1.0-rc + image: wso2/apk-common-controller:1.1.0-rc2 security: sslHostname: "commoncontroller" # configs: @@ -177,7 +177,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-ratelimiter:1.1.0-rc + image: wso2/apk-ratelimiter:1.1.0-rc2 security: sslHostname: "ratelimiter" # configs: @@ -207,7 +207,7 @@ wso2: failureThreshold: 5 strategy: RollingUpdate imagePullPolicy: Always - image: wso2/apk-router:1.1.0-rc + image: wso2/apk-router:1.1.0-rc2 # configs: # tls: # secretName: "router-cert" @@ -238,7 +238,7 @@ wso2: failureThreshold: 5 strategy: RollingUpdate imagePullPolicy: Always - image: wso2/apk-enforcer:1.1.0-rc + image: wso2/apk-enforcer:1.1.0-rc2 security: sslHostname: "enforcer" # logging: @@ -312,7 +312,7 @@ idp: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-idp-domain-service:1.1.0-rc + image: wso2/apk-idp-domain-service:1.1.0-rc2 idpui: deployment: resources: @@ -333,7 +333,7 @@ idp: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-idp-ui:1.1.0-rc + image: wso2/apk-idp-ui:1.1.0-rc2 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 index 0d60d7ff6e..c81e31dbf6 100644 --- a/helm-charts/values.yaml +++ b/helm-charts/values.yaml @@ -94,7 +94,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-config-deployer-service:1.1.0-rc + image: wso2/apk-config-deployer-service:1.1.0-rc2 # configs: # tls: # secretName: "my-secret" @@ -120,7 +120,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-adapter:1.1.0-rc + image: wso2/apk-adapter:1.1.0-rc2 security: sslHostname: "adapter" # logging: @@ -153,7 +153,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-common-controller:1.1.0-rc + image: wso2/apk-common-controller:1.1.0-rc2 security: sslHostname: "commoncontroller" # configs: @@ -180,7 +180,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-ratelimiter:1.1.0-rc + image: wso2/apk-ratelimiter:1.1.0-rc2 security: sslHostname: "ratelimiter" # configs: @@ -210,7 +210,7 @@ wso2: failureThreshold: 5 strategy: RollingUpdate imagePullPolicy: Always - image: wso2/apk-router:1.1.0-rc + image: wso2/apk-router:1.1.0-rc2 # configs: # tls: # secretName: "router-cert" @@ -241,7 +241,7 @@ wso2: failureThreshold: 5 strategy: RollingUpdate imagePullPolicy: Always - image: wso2/apk-enforcer:1.1.0-rc + image: wso2/apk-enforcer:1.1.0-rc2 security: sslHostname: "enforcer" # logging: @@ -313,7 +313,7 @@ idp: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-idp-domain-service:1.1.0-rc + image: wso2/apk-idp-domain-service:1.1.0-rc2 idpui: deployment: resources: @@ -334,7 +334,7 @@ idp: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/apk-idp-ui:1.1.0-rc + image: wso2/apk-idp-ui:1.1.0-rc2 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.template b/helm-charts/values.yaml.template index c04bb21f09..210acc7178 100644 --- a/helm-charts/values.yaml.template +++ b/helm-charts/values.yaml.template @@ -200,7 +200,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/apk-config-deployer-service:1.1.0-beta + image: wso2/apk-config-deployer-service:1.1.0-rc2 configs: # -- Enable authorization for runtime api. authorization: true @@ -255,7 +255,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/apk-adapter:1.1.0-beta + image: wso2/apk-adapter:1.1.0-rc2 security: # -- Enable security for adapter. sslHostname: "adapter" @@ -326,7 +326,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/apk-common-controller:1.1.0-beta + image: wso2/apk-common-controller:1.1.0-rc2 security: # -- hostname for the common controller sslHostname: "commoncontroller" @@ -424,7 +424,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/apk-ratelimiter:1.1.0-beta + image: wso2/apk-ratelimiter:1.1.0-rc2 security: # -- hostname for the rate limiter sslHostname: "ratelimiter" @@ -502,7 +502,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/apk-router:1.1.0-beta + image: wso2/apk-router:1.1.0-rc2 configs: # -- The timeout for response coming from enforcer to route per API request enforcerResponseTimeoutInSeconds: 20 @@ -571,7 +571,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/apk-enforcer:1.1.0-beta + image: wso2/apk-enforcer:1.1.0-rc2 security: # -- hostname for the enforcer sslHostname: "enforcer" @@ -789,7 +789,7 @@ idp: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/apk-idp-domain-service:1.1.0-beta + image: wso2/apk-idp-domain-service:1.1.0-rc2 idpui: deployment: resources: @@ -824,7 +824,7 @@ idp: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/apk-idp-ui:1.1.0-beta + image: wso2/apk-idp-ui:1.1.0-rc2 configs: # -- identity server Login URL idpLoginUrl: "https://idp.am.wso2.com:9095/commonauth/login"