From 2e822a70f0383efd75aee7873b43c1da60a23360 Mon Sep 17 00:00:00 2001 From: tharindu1st Date: Wed, 4 Oct 2023 11:02:24 +0530 Subject: [PATCH] rename apk-docker images --- .github/workflows/trivy-scan.yaml | 14 +++++++------- helm-charts/README.md | 16 ++++++++-------- helm-charts/values.yaml | 16 ++++++++-------- helm-charts/values.yaml.template | 16 ++++++++-------- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/trivy-scan.yaml b/.github/workflows/trivy-scan.yaml index b6a3111c0..44b8e61b8 100644 --- a/.github/workflows/trivy-scan.yaml +++ b/.github/workflows/trivy-scan.yaml @@ -10,7 +10,7 @@ jobs: - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master with: - image-ref: 'wso2/config-deployer-service:latest' + image-ref: 'wso2/apk-config-deployer-service:latest' format: 'table' ignore-unfixed: true vuln-type: 'os,library' @@ -21,7 +21,7 @@ jobs: - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master with: - image-ref: 'wso2/idp-domain-service:latest' + image-ref: 'wso2/apk-idp-domain-service:latest' format: 'table' ignore-unfixed: true vuln-type: 'os,library' @@ -32,7 +32,7 @@ jobs: - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master with: - image-ref: 'wso2/idp-ui:latest' + image-ref: 'wso2/apk-idp-ui:latest' format: 'table' ignore-unfixed: true vuln-type: 'os,library' @@ -43,7 +43,7 @@ jobs: - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master with: - image-ref: 'wso2/adapter:latest' + image-ref: 'wso2/apk-adapter:latest' format: 'table' ignore-unfixed: true vuln-type: 'os,library' @@ -54,7 +54,7 @@ jobs: - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master with: - image-ref: 'wso2/common-controller:latest' + image-ref: 'wso2/apk-common-controller:latest' format: 'table' ignore-unfixed: true vuln-type: 'os,library' @@ -65,7 +65,7 @@ jobs: - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master with: - image-ref: 'wso2/router:latest' + image-ref: 'wso2/apk-router:latest' format: 'table' ignore-unfixed: true vuln-type: 'os,library' @@ -76,7 +76,7 @@ jobs: - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master with: - image-ref: 'wso2/enforcer:latest' + image-ref: 'wso2/apk-enforcer:latest' format: 'table' ignore-unfixed: true vuln-type: 'os,library' diff --git a/helm-charts/README.md b/helm-charts/README.md index 9c1c8019e..48738a80d 100644 --- a/helm-charts/README.md +++ b/helm-charts/README.md @@ -66,7 +66,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/config-deployer-service:1.0.0"` | Image | +| wso2.apk.dp.configdeployer.deployment.image | string | `"wso2/apk-config-deployer-service:1.0.0"` | Image | | wso2.apk.dp.configdeployer.deployment.configs.authrorization | 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. | @@ -85,7 +85,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/adapter:1.0.0"` | Image | +| wso2.apk.dp.adapter.deployment.image | string | `"wso2/apk-adapter:1.0.0"` | Image | | wso2.apk.dp.adapter.deployment.security.sslHostname | string | `"adapter"` | Enable security for adapter. | | wso2.apk.dp.adapter.configs.apiNamespaces | string | `nil` | Optionally configure namespaces to watch for apis. | | wso2.apk.dp.adapter.configs.tls.secretName | string | `""` | TLS secret name for adapter public certificate. | @@ -107,7 +107,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/common-controller:1.0.0"` | Image | +| wso2.apk.dp.commonController.deployment.image | string | `"wso2/apk-common-controller:1.0.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.ratelimiter.enabled | bool | `true` | Enable the deployment of the Rate Limiter | @@ -124,7 +124,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/ratelimiter:1.0.0"` | Image | +| wso2.apk.dp.ratelimiter.deployment.image | string | `"wso2/apk-ratelimiter:1.0.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. | @@ -144,7 +144,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/router:1.0.0"` | Image | +| wso2.apk.dp.gatewayRuntime.deployment.router.image | string | `"wso2/apk-router:1.0.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) | @@ -171,7 +171,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/enforcer:1.0.0"` | Image | +| wso2.apk.dp.gatewayRuntime.deployment.enforcer.image | string | `"wso2/apk-enforcer:1.0.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. | @@ -241,7 +241,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/idp-domain-service:1.0.0"` | Image | +| idp.idpds.deployment.image | string | `"wso2/apk-idp-domain-service:1.0.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 | @@ -255,7 +255,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/idp-ui:1.0.0"` | Image | +| idp.idpui.deployment.image | string | `"wso2/apk-idp-ui:1.0.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 | diff --git a/helm-charts/values.yaml b/helm-charts/values.yaml index 875339301..6f2e92355 100644 --- a/helm-charts/values.yaml +++ b/helm-charts/values.yaml @@ -83,7 +83,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/config-deployer-service:1.0.0 + image: wso2/apk-config-deployer-service:1.0.0 # configs: # tls: # secretName: "my-secret" @@ -109,7 +109,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/adapter:1.0.0 + image: wso2/apk-adapter:1.0.0 security: sslHostname: "adapter" # logging: @@ -142,7 +142,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/common-controller:1.0.0 + image: wso2/apk-common-controller:1.0.0 security: sslHostname: "commoncontroller" # configs: @@ -169,7 +169,7 @@ wso2: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/ratelimiter:1.0.0 + image: wso2/apk-ratelimiter:1.0.0 security: sslHostname: "ratelimiter" # configs: @@ -199,7 +199,7 @@ wso2: failureThreshold: 5 strategy: RollingUpdate imagePullPolicy: Always - image: wso2/router:1.0.0 + image: wso2/apk-router:1.0.0 # configs: # tls: # secretName: "router-cert" @@ -230,7 +230,7 @@ wso2: failureThreshold: 5 strategy: RollingUpdate imagePullPolicy: Always - image: wso2/enforcer:1.0.0 + image: wso2/apk-enforcer:1.0.0 security: sslHostname: "enforcer" # logging: @@ -283,7 +283,7 @@ idp: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/idp-domain-service:1.0.0 + image: wso2/apk-idp-domain-service:1.0.0 idpui: deployment: resources: @@ -304,7 +304,7 @@ idp: strategy: RollingUpdate replicas: 1 imagePullPolicy: Always - image: wso2/idp-ui:1.0.0 + image: wso2/apk-idp-ui:1.0.0 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 064f44735..93a2450c4 100644 --- a/helm-charts/values.yaml.template +++ b/helm-charts/values.yaml.template @@ -137,7 +137,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/config-deployer-service:1.0.0 + image: wso2/apk-config-deployer-service:1.0.0 configs: # -- Enable authorization for runtime api. authrorization: true @@ -184,7 +184,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/adapter:1.0.0 + image: wso2/apk-adapter:1.0.0 security: # -- Enable security for adapter. sslHostname: "adapter" @@ -240,7 +240,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/common-controller:1.0.0 + image: wso2/apk-common-controller:1.0.0 security: # -- hostname for the common controller sslHostname: "commoncontroller" @@ -284,7 +284,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/ratelimiter:1.0.0 + image: wso2/apk-ratelimiter:1.0.0 security: # -- hostname for the rate limiter sslHostname: "ratelimiter" @@ -336,7 +336,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/router:1.0.0 + image: wso2/apk-router:1.0.0 configs: # -- The timeout for response coming from enforcer to route per API request enforcerResponseTimeoutInSeconds: 20 @@ -403,7 +403,7 @@ wso2: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/enforcer:1.0.0 + image: wso2/apk-enforcer:1.0.0 security: # -- hostname for the enforcer sslHostname: "enforcer" @@ -572,7 +572,7 @@ idp: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/idp-domain-service:1.0.0 + image: wso2/apk-idp-domain-service:1.0.0 idpui: deployment: resources: @@ -607,7 +607,7 @@ idp: # -- Image pull policy imagePullPolicy: Always # -- Image - image: wso2/idp-ui:1.0.0 + image: wso2/apk-idp-ui:1.0.0 configs: # -- identity server Login URL idpLoginUrl: "https://idp.am.wso2.com:9095/commonauth/login"