diff --git a/advanced/am-pattern-1/README.md b/advanced/am-pattern-1/README.md index 59e2bfcc..c782fbc5 100644 --- a/advanced/am-pattern-1/README.md +++ b/advanced/am-pattern-1/README.md @@ -252,6 +252,8 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2am` | | `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.am.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | +| `wso2.deployment.am.busyboxImageName` | Name of the Docker image to be used to run the init containers | `busybox` | +| `wso2.deployment.am.busyboxImageTag` | Tag of the init container image used | 1.32 | | `wso2.deployment.am.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for API Manager node | 180 | | `wso2.deployment.am.livenessProbe.periodSeconds` | Period of the live-ness probe for API Manager node | 10 | | `wso2.deployment.am.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for API Manager node | 180 | @@ -279,6 +281,8 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.mi.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2mi` | | `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.mi.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | +| `wso2.deployment.mi.busyboxImageName` | Name of the Docker image to be used to run the init containers | `busybox` | +| `wso2.deployment.mi.busyboxImageTag` | Tag of the init container image used | 1.32 | | `wso2.deployment.mi.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for Micro Integrator node | 35 | | `wso2.deployment.mi.livenessProbe.periodSeconds` | Period of the live-ness probe for Micro Integrator node | 10 | | `wso2.deployment.mi.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for Micro Integrator node | 35 | diff --git a/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-deployment.yaml b/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-deployment.yaml index 1fd72366..cb16da8f 100644 --- a/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-deployment.yaml +++ b/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-deployment.yaml @@ -36,10 +36,10 @@ spec: initContainers: {{ if .Values.wso2.deployment.dependencies.mysql }} - name: init-mysql-db - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of MySQL Server deployment"; while ! nc -z "wso2am-mysql-db-service" 3306; do sleep 1; printf "-"; done; echo -e " >> MySQL Server has started";'] - name: init-mysql-connector-download - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: - /bin/sh - "-c" diff --git a/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-deployment.yaml b/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-deployment.yaml index 429d8f68..fa9e193e 100644 --- a/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-deployment.yaml +++ b/advanced/am-pattern-1/templates/am/instance-2/wso2am-pattern-1-am-deployment.yaml @@ -36,10 +36,10 @@ spec: initContainers: {{ if .Values.wso2.deployment.dependencies.mysql }} - name: init-mysql-db - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of MySQL Server deployment"; while ! nc -z "wso2am-mysql-db-service" 3306; do sleep 1; printf "-"; done; echo -e " >> MySQL Server has started";'] - name: init-mysql-connector-download - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: - /bin/sh - "-c" diff --git a/advanced/am-pattern-1/templates/mi/instance-1/wso2am-pattern-1-mi-deployment.yaml b/advanced/am-pattern-1/templates/mi/instance-1/wso2am-pattern-1-mi-deployment.yaml index e19a266c..e9dfa3f0 100644 --- a/advanced/am-pattern-1/templates/mi/instance-1/wso2am-pattern-1-mi-deployment.yaml +++ b/advanced/am-pattern-1/templates/mi/instance-1/wso2am-pattern-1-mi-deployment.yaml @@ -37,7 +37,7 @@ spec: spec: initContainers: - name: init-am - image: busybox:1.32 + image: {{ .Values.wso2.deployment.mi.busyboxImageName }}:{{ .Values.wso2.deployment.mi.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of API Manager deployment"; while ! nc -z {{ template "am-pattern-1.resource.prefix" . }}-am-service 9443; do sleep 1; printf "-"; done; echo -e " >> API Manager has started";'] containers: - name: wso2micro-integrator diff --git a/advanced/am-pattern-1/values.yaml b/advanced/am-pattern-1/values.yaml index 68d771a3..16c12b5d 100644 --- a/advanced/am-pattern-1/values.yaml +++ b/advanced/am-pattern-1/values.yaml @@ -63,6 +63,9 @@ wso2: # Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images) imagePullPolicy: Always + busyboxImageName: "busybox" + busyboxImageTag: "1.32" + # Indicates whether the container is running livenessProbe: # Number of seconds after the container has started before liveness probes are initiated @@ -137,6 +140,10 @@ wso2: # dockerRegistry: "" imageName: "wso2mi" imageTag: "4.1.0" + + busyboxImageName: "busybox" + busyboxImageTag: "1.32" + # Number of deployment replicas replicas: 2 strategy: diff --git a/advanced/am-pattern-2/README.md b/advanced/am-pattern-2/README.md index 181ba728..56af8dcb 100644 --- a/advanced/am-pattern-2/README.md +++ b/advanced/am-pattern-2/README.md @@ -284,6 +284,8 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `am-pattern-1.wso2.deployment.am.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2am` | | `am-pattern-1.wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `am-pattern-1.wso2.deployment.am.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | +| `am-pattern-1.wso2.deployment.am.busyboxImageName` | Name of the Docker image to be used to run the init containers | `busybox` | +| `am-pattern-1.wso2.deployment.am.busyboxImageTag` | Tag of the init container image used | 1.32 | | `am-pattern-1.wso2.deployment.am.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for API Manager node | 180 | | `am-pattern-1.wso2.deployment.am.livenessProbe.periodSeconds` | Period of the live-ness probe for API Manager node | 10 | | `am-pattern-1.wso2.deployment.am.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for API Manager node | 180 | @@ -311,6 +313,8 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `am-pattern-1.wso2.deployment.mi.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2mi` | | `am-pattern-1.wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `am-pattern-1.wso2.deployment.mi.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | +| `am-pattern-1.wso2.deployment.am.busyboxImageName` | Name of the Docker image to be used to run the init containers | `busybox` | +| `am-pattern-1.wso2.deployment.am.busyboxImageTag` | Tag of the init container image used | 1.32 | | `am-pattern-1.wso2.deployment.mi.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for Micro Integrator node | 35 | | `am-pattern-1.wso2.deployment.mi.livenessProbe.periodSeconds` | Period of the live-ness probe for Micro Integrator node | 10 | | `am-pattern-1.wso2.deployment.mi.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for Micro Integrator node | 35 | @@ -331,6 +335,8 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.mi.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2mi` | | `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.mi.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | +| `wso2.deployment.mi.busyboxImageName` | Name of the Docker image to be used to run the init containers | `busybox` | +| `wso2.deployment.mi.busyboxImageTag` | Tag of the init container image used | 1.32 | | `wso2.deployment.mi.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for Micro Integrator node | 35 | | `wso2.deployment.mi.livenessProbe.periodSeconds` | Period of the live-ness probe for Micro Integrator node | 10 | | `wso2.deployment.mi.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for Micro Integrator node | 35 | diff --git a/advanced/am-pattern-2/templates/mi/instance-2/wso2am-pattern-2-mi-deployment.yaml b/advanced/am-pattern-2/templates/mi/instance-2/wso2am-pattern-2-mi-deployment.yaml index e3c18adf..b7215594 100644 --- a/advanced/am-pattern-2/templates/mi/instance-2/wso2am-pattern-2-mi-deployment.yaml +++ b/advanced/am-pattern-2/templates/mi/instance-2/wso2am-pattern-2-mi-deployment.yaml @@ -37,7 +37,7 @@ spec: spec: initContainers: - name: init-am - image: busybox:1.32 + image: {{ .Values.wso2.deployment.mi.busyboxImageName }}:{{ .Values.wso2.deployment.mi.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of API Manager deployment"; while ! nc -z {{ template "am-pattern-1.resource.prefix" . }}-am-service 9443; do sleep 1; printf "-"; done; echo -e " >> API Manager has started";'] containers: - name: wso2micro-integrator diff --git a/advanced/am-pattern-2/values.yaml b/advanced/am-pattern-2/values.yaml index 38e35901..3793a993 100644 --- a/advanced/am-pattern-2/values.yaml +++ b/advanced/am-pattern-2/values.yaml @@ -26,6 +26,10 @@ wso2: # dockerRegistry: "" imageName: "wso2mi" imageTag: "4.1.0" + + busyboxImageName: "busybox" + busyboxImageTag: "1.32" + # Number of deployment replicas replicas: 2 strategy: @@ -132,6 +136,9 @@ am-pattern-1: # Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images) imagePullPolicy: Always + busyboxImageName: "busybox" + busyboxImageTag: "1.32" + # Indicates whether the container is running livenessProbe: # Number of seconds after the container has started before liveness probes are initiated @@ -206,6 +213,10 @@ am-pattern-1: # dockerRegistry: "" imageName: "wso2mi" imageTag: "4.1.0" + + busyboxImageName: "busybox" + busyboxImageTag: "1.32" + # Number of deployment replicas replicas: 2 strategy: diff --git a/advanced/am-pattern-3/README.md b/advanced/am-pattern-3/README.md index 0c7ba1c6..ca8e2a3b 100644 --- a/advanced/am-pattern-3/README.md +++ b/advanced/am-pattern-3/README.md @@ -249,6 +249,8 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2am` | | `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.am.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | +| `wso2.deployment.am.busyboxImageName` | Name of the Docker image to be used to run the init containers | `busybox` | +| `wso2.deployment.am.busyboxImageTag` | Tag of the init container image used | 1.32 | | `wso2.deployment.am.resources.requests.memory` | The minimum amount of memory that should be allocated for running API Manager product profiles with profile optimization | 1Gi | | `wso2.deployment.am.resources.requests.cpu` | The minimum amount of CPU that should be allocated for running API Manager product profiles with profile optimization | 1000m | | `wso2.deployment.am.resources.limits.memory` | The maximum amount of memory that should be allocated for running API Manager product profiles with profile optimization | 2Gi | @@ -288,6 +290,8 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.mi.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2mi` | | `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.mi.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | +| `wso2.deployment.mi.busyboxImageName` | Name of the Docker image to be used to run the init containers | `busybox` | +| `wso2.deployment.mi.busyboxImageTag` | Tag of the init container image used | 1.32 | | `wso2.deployment.mi.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for Micro Integrator node | 35 | | `wso2.deployment.mi.livenessProbe.periodSeconds` | Period of the live-ness probe for Micro Integrator node | 10 | | `wso2.deployment.mi.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for Micro Integrator node | 35 | diff --git a/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-deployment.yaml b/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-deployment.yaml index f1312822..f60cf852 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-deployment.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/instance-1/wso2am-pattern-3-am-control-plane-deployment.yaml @@ -36,10 +36,10 @@ spec: initContainers: {{ if .Values.wso2.deployment.dependencies.mysql }} - name: init-mysql-db - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of MySQL Server deployment"; while ! nc -z "wso2am-mysql-db-service" 3306; do sleep 1; printf "-"; done; echo -e " >> MySQL Server has started";'] - name: init-mysql-connector-download - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: - /bin/sh - "-c" diff --git a/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-deployment.yaml b/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-deployment.yaml index 5ae0b0b7..cb63bb0d 100644 --- a/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-deployment.yaml +++ b/advanced/am-pattern-3/templates/am/control-plane/instance-2/wso2am-pattern-3-am-control-plane-deployment.yaml @@ -36,10 +36,10 @@ spec: initContainers: {{ if .Values.wso2.deployment.dependencies.mysql }} - name: init-mysql-db - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of MySQL Server deployment"; while ! nc -z "wso2am-mysql-db-service" 3306; do sleep 1; printf "-"; done; echo -e " >> MySQL Server has started";'] - name: init-mysql-connector-download - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: - /bin/sh - "-c" diff --git a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-deployment.yaml b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-deployment.yaml index 14ad27ef..7974f9f4 100644 --- a/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-deployment.yaml +++ b/advanced/am-pattern-3/templates/am/gateway/wso2am-pattern-3-am-gateway-deployment.yaml @@ -36,7 +36,7 @@ spec: spec: initContainers: - name: init-cp - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of Control Plane deployment"; while ! nc -z {{ template "am-pattern-3.resource.prefix" . }}-am-cp-service 9443; do sleep 1; printf "-"; done; echo -e " >> Control Plane has started";'] containers: - name: wso2am-gateway diff --git a/advanced/am-pattern-3/templates/mi/instance-1/wso2am-pattern-3-mi-deployment.yaml b/advanced/am-pattern-3/templates/mi/instance-1/wso2am-pattern-3-mi-deployment.yaml index 6f696d92..d4ef5e3e 100644 --- a/advanced/am-pattern-3/templates/mi/instance-1/wso2am-pattern-3-mi-deployment.yaml +++ b/advanced/am-pattern-3/templates/mi/instance-1/wso2am-pattern-3-mi-deployment.yaml @@ -37,10 +37,10 @@ spec: spec: initContainers: - name: init-cp - image: busybox:1.32 + image: {{ .Values.wso2.deployment.mi.busyboxImageName }}:{{ .Values.wso2.deployment.mi.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of Control Plane deployment"; while ! nc -z {{ template "am-pattern-3.resource.prefix" . }}-am-cp-service 9443; do sleep 1; printf "-"; done; echo -e " >> Control Plane has started";'] - name: init-gw - image: busybox:1.32 + image: {{ .Values.wso2.deployment.mi.busyboxImageName }}:{{ .Values.wso2.deployment.mi.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of Gateway deployment"; while ! nc -z {{ template "am-pattern-3.resource.prefix" . }}-am-gateway-service 8243; do sleep 1; printf "-"; done; echo -e " >> Gateway has started";'] containers: - name: wso2micro-integrator diff --git a/advanced/am-pattern-3/values.yaml b/advanced/am-pattern-3/values.yaml index 574f0844..c6868ff5 100644 --- a/advanced/am-pattern-3/values.yaml +++ b/advanced/am-pattern-3/values.yaml @@ -63,6 +63,9 @@ wso2: # Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images) imagePullPolicy: Always + busyboxImageName: "busybox" + busyboxImageTag: "1.32" + resources: # These are the resource recommendations for running WSO2 API Management product profiles with profile optimization # Resource configurations defined here are applicable for all API Manager product profiles of this deployment @@ -218,6 +221,10 @@ wso2: # dockerRegistry: "" imageName: "wso2mi" imageTag: "4.1.0" + + busyboxImageName: "busybox" + busyboxImageTag: "1.32" + # Number of deployment replicas replicas: 2 strategy: diff --git a/advanced/am-pattern-4/README.md b/advanced/am-pattern-4/README.md index 718eb71c..b4597665 100644 --- a/advanced/am-pattern-4/README.md +++ b/advanced/am-pattern-4/README.md @@ -249,6 +249,8 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2am` | | `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.am.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | +| `wso2.deployment.am.busyboxImageName` | Name of the Docker image to be used to run the init containers | `busybox` | +| `wso2.deployment.am.busyboxImageTag` | Tag of the init container image used | 1.32 | | `wso2.deployment.am.resources.requests.memory` | The minimum amount of memory that should be allocated for running API Manager product profiles with profile optimization | 1Gi | | `wso2.deployment.am.resources.requests.cpu` | The minimum amount of CPU that should be allocated for running API Manager product profiles with profile optimization | 1000m | | `wso2.deployment.am.resources.limits.memory` | The maximum amount of memory that should be allocated for running API Manager product profiles with profile optimization | 2Gi | @@ -299,6 +301,8 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.mi.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2mi` | | `wso2.deployment.mi.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.mi.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | +| `wso2.deployment.mi.busyboxImageName` | Name of the Docker image to be used to run the init containers | `busybox` | +| `wso2.deployment.mi.busyboxImageTag` | Tag of the init container image used | 1.32 | | `wso2.deployment.mi.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for Micro Integrator node | 35 | | `wso2.deployment.mi.livenessProbe.periodSeconds` | Period of the live-ness probe for Micro Integrator node | 10 | | `wso2.deployment.mi.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for Micro Integrator node | 35 | diff --git a/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-deployment.yaml b/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-deployment.yaml index b08df189..5bfcb8e3 100644 --- a/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-deployment.yaml +++ b/advanced/am-pattern-4/templates/am/control-plane/instance-1/wso2am-pattern-4-am-control-plane-deployment.yaml @@ -36,10 +36,10 @@ spec: initContainers: {{ if .Values.wso2.deployment.dependencies.mysql }} - name: init-mysql-db - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of MySQL Server deployment"; while ! nc -z "wso2am-mysql-db-service" 3306; do sleep 1; printf "-"; done; echo -e " >> MySQL Server has started";'] - name: init-mysql-connector-download - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: - /bin/sh - "-c" diff --git a/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-deployment.yaml b/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-deployment.yaml index 499476e7..7cf48444 100644 --- a/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-deployment.yaml +++ b/advanced/am-pattern-4/templates/am/control-plane/instance-2/wso2am-pattern-4-am-control-plane-deployment.yaml @@ -36,10 +36,10 @@ spec: initContainers: {{ if .Values.wso2.deployment.dependencies.mysql }} - name: init-mysql-db - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of MySQL Server deployment"; while ! nc -z "wso2am-mysql-db-service" 3306; do sleep 1; printf "-"; done; echo -e " >> MySQL Server has started";'] - name: init-mysql-connector-download - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: - /bin/sh - "-c" diff --git a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-deployment.yaml b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-deployment.yaml index 95b73288..0fef4422 100644 --- a/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-deployment.yaml +++ b/advanced/am-pattern-4/templates/am/gateway/wso2am-pattern-4-am-gateway-deployment.yaml @@ -36,10 +36,10 @@ spec: spec: initContainers: - name: init-tm1 - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of Traffic Manager Instance One deployment"; while ! nc -z {{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-1-service 9611; do sleep 1; printf "-"; done; echo -e " >> Traffic Manager Instance One has started";'] - name: init-tm2 - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: [ 'sh', '-c', 'echo -e "Checking for the availability of Traffic Manager Instance Two deployment"; while ! nc -z {{ template "am-pattern-4.resource.prefix" . }}-am-trafficmanager-2-service 9611; do sleep 1; printf "-"; done; echo -e " >> Traffic Manager Instance Two has started";' ] containers: - name: wso2am-gateway diff --git a/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-deployment.yaml b/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-deployment.yaml index 71adfcca..c48cfecd 100644 --- a/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-deployment.yaml +++ b/advanced/am-pattern-4/templates/am/traffic-manager/instance-1/wso2am-pattern-4-am-trafficmanager-deployment.yaml @@ -35,7 +35,7 @@ spec: spec: initContainers: - name: init-cp - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of Control Plane deployment"; while ! nc -z {{ template "am-pattern-4.resource.prefix" . }}-am-cp-service 9443; do sleep 1; printf "-"; done; echo -e " >> Control Plane has started";'] containers: - name: wso2am diff --git a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-deployment.yaml b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-deployment.yaml index 4a605418..73fc6a27 100644 --- a/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-deployment.yaml +++ b/advanced/am-pattern-4/templates/am/traffic-manager/instance-2/wso2am-pattern-4-am-trafficmanager-deployment.yaml @@ -35,7 +35,7 @@ spec: spec: initContainers: - name: init-cp - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of Control Plane deployment"; while ! nc -z {{ template "am-pattern-4.resource.prefix" . }}-am-cp-service 9443; do sleep 1; printf "-"; done; echo -e " >> Control Plane has started";'] containers: - name: wso2am diff --git a/advanced/am-pattern-4/templates/mi/wso2am-pattern-4-mi-deployment.yaml b/advanced/am-pattern-4/templates/mi/wso2am-pattern-4-mi-deployment.yaml index 5241d968..31737c63 100644 --- a/advanced/am-pattern-4/templates/mi/wso2am-pattern-4-mi-deployment.yaml +++ b/advanced/am-pattern-4/templates/mi/wso2am-pattern-4-mi-deployment.yaml @@ -37,10 +37,10 @@ spec: spec: initContainers: - name: init-cp - image: busybox:1.32 + image: {{ .Values.wso2.deployment.mi.busyboxImageName }}:{{ .Values.wso2.deployment.mi.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of Control Plane deployment"; while ! nc -z {{ template "am-pattern-4.resource.prefix" . }}-am-cp-service 9443; do sleep 1; printf "-"; done; echo -e " >> Control Plane has started";'] - name: init-gw - image: busybox:1.32 + image: {{ .Values.wso2.deployment.mi.busyboxImageName }}:{{ .Values.wso2.deployment.mi.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of Gateway deployment"; while ! nc -z {{ template "am-pattern-4.resource.prefix" . }}-am-gateway-service 8243; do sleep 1; printf "-"; done; echo -e " >> Gateway has started";'] containers: - name: wso2micro-integrator diff --git a/advanced/am-pattern-4/values.yaml b/advanced/am-pattern-4/values.yaml index 251f9d9d..bf827ff3 100644 --- a/advanced/am-pattern-4/values.yaml +++ b/advanced/am-pattern-4/values.yaml @@ -63,6 +63,9 @@ wso2: # Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images) imagePullPolicy: Always + busyboxImageName: "busybox" + busyboxImageTag: "1.32" + resources: # These are the resource recommendations for running WSO2 API Management product profiles with profile optimization # Resource configurations defined here are applicable for all API Manager product profiles of this deployment @@ -261,6 +264,10 @@ wso2: # dockerRegistry: "" imageName: "wso2mi" imageTag: "4.1.0" + + busyboxImageName: "busybox" + busyboxImageTag: "1.32" + # Number of deployment replicas replicas: 2 strategy: diff --git a/simple/am-single/README.md b/simple/am-single/README.md index 9699342e..ef22e01b 100644 --- a/simple/am-single/README.md +++ b/simple/am-single/README.md @@ -227,6 +227,8 @@ If you do not have an active WSO2 subscription, **do not change** the parameters | `wso2.deployment.am.imageName` | Name of the Docker image to be used to create API Manager instances | `wso2am` | | `wso2.deployment.am.imageTag` | Tag of the image used to create API Manager instances | 4.1.0 | | `wso2.deployment.am.imagePullPolicy` | Refer to [doc](https://kubernetes.io/docs/concepts/containers/images#updating-images) | `Always` | +| `wso2.deployment.am.busyboxImageName` | Name of the Docker image to be used to run the init containers | `busybox` | +| `wso2.deployment.am.busyboxImageTag` | Tag of the init container image used | 1.32 | | `wso2.deployment.am.livenessProbe.initialDelaySeconds` | Initial delay for the live-ness probe for API Manager node | 180 | | `wso2.deployment.am.livenessProbe.periodSeconds` | Period of the live-ness probe for API Manager node | 10 | | `wso2.deployment.am.readinessProbe.initialDelaySeconds` | Initial delay for the readiness probe for API Manager node | 180 | diff --git a/simple/am-single/templates/am/instance/wso2am-deployment.yaml b/simple/am-single/templates/am/instance/wso2am-deployment.yaml index 59072a18..ff37aa05 100644 --- a/simple/am-single/templates/am/instance/wso2am-deployment.yaml +++ b/simple/am-single/templates/am/instance/wso2am-deployment.yaml @@ -36,10 +36,10 @@ spec: initContainers: {{ if .Values.wso2.deployment.dependencies.mysql }} - name: init-mysql-db - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: ['sh', '-c', 'echo -e "Checking for the availability of MySQL Server deployment"; while ! nc -z "wso2am-mysql-db-service" 3306; do sleep 1; printf "-"; done; echo -e " >> MySQL Server has started";'] - name: init-mysql-connector-download - image: busybox:1.32 + image: {{ .Values.wso2.deployment.am.busyboxImageName }}:{{ .Values.wso2.deployment.am.busyboxImageTag }} command: - /bin/sh - "-c" diff --git a/simple/am-single/values.yaml b/simple/am-single/values.yaml index 1cc80742..6c84668b 100644 --- a/simple/am-single/values.yaml +++ b/simple/am-single/values.yaml @@ -63,6 +63,9 @@ wso2: # Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images) imagePullPolicy: Always + busyboxImageName: "busybox" + busyboxImageTag: "1.32" + # Indicates whether the container is running livenessProbe: # Number of seconds after the container has started before liveness probes are initiated