Skip to content

Commit

Permalink
Merge pull request #2341 from CrowleyRajapakse/mymain2
Browse files Browse the repository at this point in the history
Changing image names and helm chart release to 1.1.0
  • Loading branch information
CrowleyRajapakse authored Apr 10, 2024
2 parents a11a047 + cec8768 commit d9749db
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion helm-charts/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: apk-helm
description: A Helm chart for APK components
type: application
version: 1.1.0-rc2
version: 1.1.0
appVersion: "1.16.0"
dependencies:
- name: postgresql
Expand Down
18 changes: 9 additions & 9 deletions helm-charts/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# apk-helm

![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)
![Version: 1.1.0](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

Expand Down Expand Up @@ -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-rc2"` | Image |
| wso2.apk.dp.configdeployer.deployment.image | string | `"wso2/apk-config-deployer-service:1.1.0"` | 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. |
Expand All @@ -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-rc2"` | Image |
| wso2.apk.dp.adapter.deployment.image | string | `"wso2/apk-adapter:1.1.0"` | 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. |
Expand All @@ -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-rc2"` | Image |
| wso2.apk.dp.commonController.deployment.image | string | `"wso2/apk-common-controller:1.1.0"` | 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. |
Expand Down Expand Up @@ -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-rc2"` | Image |
| wso2.apk.dp.ratelimiter.deployment.image | string | `"wso2/apk-ratelimiter:1.1.0"` | 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. |
Expand All @@ -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-rc2"` | Image |
| wso2.apk.dp.gatewayRuntime.deployment.router.image | string | `"wso2/apk-router:1.1.0"` | 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) |
Expand Down Expand Up @@ -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-rc2"` | Image |
| wso2.apk.dp.gatewayRuntime.deployment.enforcer.image | string | `"wso2/apk-enforcer:1.1.0"` | 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. |
Expand Down Expand Up @@ -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-rc2"` | Image |
| idp.idpds.deployment.image | string | `"wso2/apk-idp-domain-service:1.1.0"` | 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 |
Expand All @@ -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-rc2"` | Image |
| idp.idpui.deployment.image | string | `"wso2/apk-idp-ui:1.1.0"` | 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 |
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/samples/apim-apk-agent/cp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
replicaCount: 1
image:
repository: wso2/apim-apk-agent
tag: 1.1.0-rc2
tag: 1.1.0
pullPolicy: Always
service:
name: apim-apk-agent-service
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/samples/apim-apk-agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
replicaCount: 1
image:
repository: wso2/apim-apk-agent
tag: 1.1.0-rc2
tag: 1.1.0
pullPolicy: Always
service:
name: apim-apk-agent-service
Expand Down
16 changes: 8 additions & 8 deletions helm-charts/samples/apk/cp-enabled-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-config-deployer-service:1.1.0-rc2
image: wso2/apk-config-deployer-service:1.1.0
# configs:
# tls:
# secretName: "my-secret"
Expand All @@ -117,7 +117,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-adapter:1.1.0-rc2
image: wso2/apk-adapter:1.1.0
security:
sslHostname: "adapter"
# logging:
Expand Down Expand Up @@ -150,7 +150,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-common-controller:1.1.0-rc2
image: wso2/apk-common-controller:1.1.0
security:
sslHostname: "commoncontroller"
# configs:
Expand All @@ -177,7 +177,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-ratelimiter:1.1.0-rc2
image: wso2/apk-ratelimiter:1.1.0
security:
sslHostname: "ratelimiter"
# configs:
Expand Down Expand Up @@ -207,7 +207,7 @@ wso2:
failureThreshold: 5
strategy: RollingUpdate
imagePullPolicy: Always
image: wso2/apk-router:1.1.0-rc2
image: wso2/apk-router:1.1.0
# configs:
# tls:
# secretName: "router-cert"
Expand Down Expand Up @@ -238,7 +238,7 @@ wso2:
failureThreshold: 5
strategy: RollingUpdate
imagePullPolicy: Always
image: wso2/apk-enforcer:1.1.0-rc2
image: wso2/apk-enforcer:1.1.0
security:
sslHostname: "enforcer"
# logging:
Expand Down Expand Up @@ -310,7 +310,7 @@ idp:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-idp-domain-service:1.1.0-rc2
image: wso2/apk-idp-domain-service:1.1.0
idpui:
deployment:
resources:
Expand All @@ -331,7 +331,7 @@ idp:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-idp-ui:1.1.0-rc2
image: wso2/apk-idp-ui:1.1.0
configs:
idpLoginUrl: "https://idp.am.wso2.com:9095/commonauth/login"
idpAuthCallBackUrl: "https://idp.am.wso2.com:9095/oauth2/auth-callback"
Expand Down
16 changes: 8 additions & 8 deletions helm-charts/samples/apk/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-config-deployer-service:1.1.0-rc2
image: wso2/apk-config-deployer-service:1.1.0
# configs:
# tls:
# secretName: "my-secret"
Expand All @@ -118,7 +118,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-adapter:1.1.0-rc2
image: wso2/apk-adapter:1.1.0
security:
sslHostname: "adapter"
# logging:
Expand Down Expand Up @@ -151,7 +151,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-common-controller:1.1.0-rc2
image: wso2/apk-common-controller:1.1.0
security:
sslHostname: "commoncontroller"
# configs:
Expand All @@ -178,7 +178,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-ratelimiter:1.1.0-rc2
image: wso2/apk-ratelimiter:1.1.0
security:
sslHostname: "ratelimiter"
# configs:
Expand Down Expand Up @@ -208,7 +208,7 @@ wso2:
failureThreshold: 5
strategy: RollingUpdate
imagePullPolicy: Always
image: wso2/apk-router:1.1.0-rc2
image: wso2/apk-router:1.1.0
# configs:
# tls:
# secretName: "router-cert"
Expand Down Expand Up @@ -239,7 +239,7 @@ wso2:
failureThreshold: 5
strategy: RollingUpdate
imagePullPolicy: Always
image: wso2/apk-enforcer:1.1.0-rc2
image: wso2/apk-enforcer:1.1.0
security:
sslHostname: "enforcer"
# logging:
Expand Down Expand Up @@ -313,7 +313,7 @@ idp:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-idp-domain-service:1.1.0-rc2
image: wso2/apk-idp-domain-service:1.1.0
idpui:
deployment:
resources:
Expand All @@ -334,7 +334,7 @@ idp:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-idp-ui:1.1.0-rc2
image: wso2/apk-idp-ui:1.1.0
configs:
idpLoginUrl: "https://idp.am.wso2.com:9095/commonauth/login"
idpAuthCallBackUrl: "https://idp.am.wso2.com:9095/oauth2/auth-callback"
Expand Down
16 changes: 8 additions & 8 deletions helm-charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-config-deployer-service:1.1.0-rc2
image: wso2/apk-config-deployer-service:1.1.0
# debug: true
# configs:
# tls:
Expand All @@ -121,7 +121,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-adapter:1.1.0-rc2
image: wso2/apk-adapter:1.1.0
security:
sslHostname: "adapter"
# logging:
Expand Down Expand Up @@ -154,7 +154,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-common-controller:1.1.0-rc2
image: wso2/apk-common-controller:1.1.0
security:
sslHostname: "commoncontroller"
# configs:
Expand All @@ -181,7 +181,7 @@ wso2:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-ratelimiter:1.1.0-rc2
image: wso2/apk-ratelimiter:1.1.0
security:
sslHostname: "ratelimiter"
# configs:
Expand Down Expand Up @@ -211,7 +211,7 @@ wso2:
failureThreshold: 5
strategy: RollingUpdate
imagePullPolicy: Always
image: wso2/apk-router:1.1.0-rc2
image: wso2/apk-router:1.1.0
# configs:
# tls:
# secretName: "router-cert"
Expand Down Expand Up @@ -242,7 +242,7 @@ wso2:
failureThreshold: 5
strategy: RollingUpdate
imagePullPolicy: Always
image: wso2/apk-enforcer:1.1.0-rc2
image: wso2/apk-enforcer:1.1.0
security:
sslHostname: "enforcer"
# logging:
Expand Down Expand Up @@ -314,7 +314,7 @@ idp:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-idp-domain-service:1.1.0-rc2
image: wso2/apk-idp-domain-service:1.1.0
idpui:
deployment:
resources:
Expand All @@ -335,7 +335,7 @@ idp:
strategy: RollingUpdate
replicas: 1
imagePullPolicy: Always
image: wso2/apk-idp-ui:1.1.0-rc2
image: wso2/apk-idp-ui:1.1.0
configs:
idpLoginUrl: "https://idp.am.wso2.com:9095/commonauth/login"
idpAuthCallBackUrl: "https://idp.am.wso2.com:9095/oauth2/auth-callback"
Expand Down
16 changes: 8 additions & 8 deletions helm-charts/values.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ wso2:
# -- Image pull policy
imagePullPolicy: Always
# -- Image
image: wso2/apk-config-deployer-service:1.1.0-rc2
image: wso2/apk-config-deployer-service:1.1.0
configs:
# -- Enable authorization for runtime api.
authorization: true
Expand Down Expand Up @@ -255,7 +255,7 @@ wso2:
# -- Image pull policy
imagePullPolicy: Always
# -- Image
image: wso2/apk-adapter:1.1.0-rc2
image: wso2/apk-adapter:1.1.0
security:
# -- Enable security for adapter.
sslHostname: "adapter"
Expand Down Expand Up @@ -326,7 +326,7 @@ wso2:
# -- Image pull policy
imagePullPolicy: Always
# -- Image
image: wso2/apk-common-controller:1.1.0-rc2
image: wso2/apk-common-controller:1.1.0
security:
# -- hostname for the common controller
sslHostname: "commoncontroller"
Expand Down Expand Up @@ -424,7 +424,7 @@ wso2:
# -- Image pull policy
imagePullPolicy: Always
# -- Image
image: wso2/apk-ratelimiter:1.1.0-rc2
image: wso2/apk-ratelimiter:1.1.0
security:
# -- hostname for the rate limiter
sslHostname: "ratelimiter"
Expand Down Expand Up @@ -502,7 +502,7 @@ wso2:
# -- Image pull policy
imagePullPolicy: Always
# -- Image
image: wso2/apk-router:1.1.0-rc2
image: wso2/apk-router:1.1.0
configs:
# -- The timeout for response coming from enforcer to route per API request
enforcerResponseTimeoutInSeconds: 20
Expand Down Expand Up @@ -571,7 +571,7 @@ wso2:
# -- Image pull policy
imagePullPolicy: Always
# -- Image
image: wso2/apk-enforcer:1.1.0-rc2
image: wso2/apk-enforcer:1.1.0
security:
# -- hostname for the enforcer
sslHostname: "enforcer"
Expand Down Expand Up @@ -789,7 +789,7 @@ idp:
# -- Image pull policy
imagePullPolicy: Always
# -- Image
image: wso2/apk-idp-domain-service:1.1.0-rc2
image: wso2/apk-idp-domain-service:1.1.0
idpui:
deployment:
resources:
Expand Down Expand Up @@ -824,7 +824,7 @@ idp:
# -- Image pull policy
imagePullPolicy: Always
# -- Image
image: wso2/apk-idp-ui:1.1.0-rc2
image: wso2/apk-idp-ui:1.1.0
configs:
# -- identity server Login URL
idpLoginUrl: "https://idp.am.wso2.com:9095/commonauth/login"
Expand Down

0 comments on commit d9749db

Please sign in to comment.