Skip to content

Commit d6fc1df

Browse files
author
Corneil du Plessis
authored
[CI] Remove MariaDB specific init-container. (spring-cloud#5635)
1 parent fdc0a94 commit d6fc1df

File tree

6 files changed

+3
-41
lines changed

6 files changed

+3
-41
lines changed

spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes-app-properties.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,6 @@ The following example shows how you can configure additional containers for an a
11581158
====
11591159
[source,options=nowrap]
11601160
----
1161-
deployer.<application>.kubernetes.additionalContainers=[{name: 'c1', image: 'busybox:latest', command: ['sh', '-c', 'echo hello1'], volumeMounts: [{name: 'test-volume', mountPath: '/tmp', readOnly: true}]},{name: 'c2', image: 'busybox:1.26.1', command: ['sh', '-c', 'echo hello2']}]
1161+
deployer.<application>.kubernetes.additionalContainers=[{name: 'c1', image: 'busybox:1', command: ['sh', '-c', 'echo hello1'], volumeMounts: [{name: 'test-volume', mountPath: '/tmp', readOnly: true}]},{name: 'c2', image: 'busybox:1.26.1', command: ['sh', '-c', 'echo hello2']}]
11621162
----
11631163
====

spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -399,11 +399,11 @@ These properties are also used when configuring the <<configuration-kubernetes-t
399399
|<none>
400400

401401
|initContainer
402-
|An Init Container expressed in YAML format to be applied to a pod. e.g. ```{containerName: 'test', imageName: 'busybox:latest', commands: ['sh', '-c', 'echo hello']}```
402+
|An Init Container expressed in YAML format to be applied to a pod. e.g. ```{containerName: 'test', imageName: 'busybox:1', commands: ['sh', '-c', 'echo hello']}```
403403
|<none>
404404

405405
|additionalContainers
406-
|Additional containers expressed in YAML format to be applied to a pod. e.g. ```[{name: 'c1', image: 'busybox:latest', command: ['sh', '-c', 'echo hello1'], volumeMounts: [{name: 'test-volume', mountPath: '/tmp', readOnly: true}]}, {name: 'c2', image: 'busybox:1.26.1', command: ['sh', '-c', 'echo hello2']}]```
406+
|Additional containers expressed in YAML format to be applied to a pod. e.g. ```[{name: 'c1', image: 'busybox:1', command: ['sh', '-c', 'echo hello1'], volumeMounts: [{name: 'test-volume', mountPath: '/tmp', readOnly: true}]}, {name: 'c2', image: 'busybox:1.26.1', command: ['sh', '-c', 'echo hello2']}]```
407407
|<none>
408408
|===
409409

src/kubernetes/server/server-deployment.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,6 @@ spec:
8080
# Provide the Skipper service location
8181
- name: SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI
8282
value: 'http://${SKIPPER_SERVICE_HOST}:${SKIPPER_SERVICE_PORT}/api'
83-
initContainers:
84-
- name: init-mariadb-wait
85-
image: busybox:1
86-
imagePullPolicy: IfNotPresent
87-
command: ['sh', '-c', 'until nc -w3 -z mariadb 3306; do echo waiting for mariadb; sleep 3; done;']
8883
serviceAccountName: scdf-sa
8984
volumes:
9085
- name: config

src/kubernetes/skipper/skipper-deployment.yaml

-14
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,6 @@ spec:
6969
value: 'false'
7070
- name: SPRING_CLOUD_KUBERNETES_SECRETS_PATHS
7171
value: /etc/secrets
72-
initContainers:
73-
- name: init-mariadb-wait
74-
image: busybox:1
75-
imagePullPolicy: IfNotPresent
76-
command: ['sh', '-c', 'until nc -w3 -z mariadb 3306; do echo waiting for mariadb; sleep 3; done;']
77-
- name: init-mariadb-database
78-
image: mariadb:10.4
79-
env:
80-
- name: MARIADB_PWD
81-
valueFrom:
82-
secretKeyRef:
83-
name: mariadb
84-
key: database-password
85-
command: ['sh', '-c', 'mariadb -h mariadb -u root --password=$MARIADB_PWD -e "CREATE DATABASE IF NOT EXISTS skipper;"']
8672
serviceAccountName: scdf-sa
8773
volumes:
8874
- name: config

src/templates/kubernetes/server/server-deployment.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@ spec:
7676
# Provide the Skipper service location
7777
- name: SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI
7878
value: 'http://${SKIPPER_SERVICE_HOST}:${SKIPPER_SERVICE_PORT}/api'
79-
initContainers:
80-
- name: init-mariadb-wait
81-
image: busybox:1
82-
imagePullPolicy: IfNotPresent
83-
command: ['sh', '-c', 'until nc -w3 -z mariadb 3306; do echo waiting for mariadb; sleep 3; done;']
8479
serviceAccountName: scdf-sa
8580
volumes:
8681
- name: config

src/templates/kubernetes/skipper/skipper-deployment.yaml

-14
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,6 @@ spec:
7070
value: 'false'
7171
- name: SPRING_CLOUD_KUBERNETES_SECRETS_PATHS
7272
value: /etc/secrets
73-
initContainers:
74-
- name: init-mariadb-wait
75-
image: busybox:1
76-
imagePullPolicy: IfNotPresent
77-
command: ['sh', '-c', 'until nc -w3 -z mariadb 3306; do echo waiting for mariadb; sleep 3; done;']
78-
- name: init-mariadb-database
79-
image: mariadb:10.4
80-
env:
81-
- name: MARIADB_PWD
82-
valueFrom:
83-
secretKeyRef:
84-
name: mariadb
85-
key: database-password
86-
command: ['sh', '-c', 'mariadb -h mariadb -u root --password=$MARIADB_PWD -e "CREATE DATABASE IF NOT EXISTS skipper;"']
8773
serviceAccountName: scdf-sa
8874
volumes:
8975
- name: config

0 commit comments

Comments
 (0)