From da7f9f3446971bedc8c1f5a6d285cef8e1485b45 Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:25:57 +0100 Subject: [PATCH 01/10] Update sync.py --- .../installs/multi-user/pipelines-profile-controller/sync.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/sync.py b/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/sync.py index 75c6e5db61..d3161a9c38 100644 --- a/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/sync.py +++ b/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/sync.py @@ -266,4 +266,4 @@ def do_POST(self): self.wfile.write(bytes(json.dumps(desired), 'utf-8')) -HTTPServer(("", 80), Controller).serve_forever() +HTTPServer(("", 8080), Controller).serve_forever() From 67e967d132d44c573af94b01915fe0b249993b43 Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:28:29 +0100 Subject: [PATCH 02/10] Update service.yaml --- .../multi-user/pipelines-profile-controller/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/service.yaml b/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/service.yaml index a7ecff1821..9c5316ddfa 100644 --- a/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/service.yaml +++ b/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/service.yaml @@ -7,4 +7,4 @@ spec: - name: http port: 80 protocol: TCP - targetPort: 80 + targetPort: 8080 From b9daccbb3b248d293e6dcba915907c1616b59c34 Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:32:10 +0100 Subject: [PATCH 03/10] Update apps_v1_deployment_metadata-db.yaml --- .../test_data/expected/apps_v1_deployment_metadata-db.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/stacks/openshift/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml b/tests/stacks/openshift/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml index 6af9bf661e..57d42d4ce1 100644 --- a/tests/stacks/openshift/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml +++ b/tests/stacks/openshift/application/metadata/test_data/expected/apps_v1_deployment_metadata-db.yaml @@ -42,8 +42,7 @@ spec: command: - /bin/bash - -c - - mysql -D $$MYSQL_DATABASE -u$$MYSQL_USER_NAME -p$$MYSQL_ROOT_PASSWORD - -e 'SELECT 1' + - mysql --database=$MYSQL_DATABASE --password=$MYSQL_ROOT_PASSWORD --user=$MYSQL_USER_NAME -e 'SELECT 1' initialDelaySeconds: 5 periodSeconds: 2 timeoutSeconds: 1 From 04b093dc862ba90d625fb670103757f44cee26e5 Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:34:24 +0100 Subject: [PATCH 04/10] Update metadata-db-deployment.yaml --- contrib/metadata/overlays/db/metadata-db-deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/metadata/overlays/db/metadata-db-deployment.yaml b/contrib/metadata/overlays/db/metadata-db-deployment.yaml index 88bde9d65c..09cbe826ef 100644 --- a/contrib/metadata/overlays/db/metadata-db-deployment.yaml +++ b/contrib/metadata/overlays/db/metadata-db-deployment.yaml @@ -21,7 +21,7 @@ spec: spec: containers: - name: db-container - image: mysql:8.0.3 + image: mysql:8.0 args: - --datadir - /var/lib/mysql/datadir @@ -38,7 +38,7 @@ spec: command: - "/bin/bash" - "-c" - - "mysql -D $$MYSQL_DATABASE -p$$MYSQL_ROOT_PASSWORD -e 'SELECT 1'" + - "mysql --database=$MYSQL_DATABASE --password=$MYSQL_ROOT_PASSWORD --user=$MYSQL_USER_NAME -e 'SELECT 1'" initialDelaySeconds: 5 periodSeconds: 2 timeoutSeconds: 1 From 9416df9d468fd5a81cd99d848ad5f0fa595a4ec0 Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:39:57 +0100 Subject: [PATCH 05/10] Update patchdb.yaml --- .../stacks/openshift/application/metadata/patchdb.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/stacks/openshift/application/metadata/patchdb.yaml b/distributions/stacks/openshift/application/metadata/patchdb.yaml index eaa5910dfd..ab259ad3ab 100644 --- a/distributions/stacks/openshift/application/metadata/patchdb.yaml +++ b/distributions/stacks/openshift/application/metadata/patchdb.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/template/spec/containers/0/readinessProbe/exec/command/2 - value: "mysql -D $$MYSQL_DATABASE -u$$MYSQL_USER_NAME -p$$MYSQL_ROOT_PASSWORD -e 'SELECT 1'" + value: "mysql --database=$MYSQL_DATABASE --password=$MYSQL_ROOT_PASSWORD --user=$MYSQL_USER_NAME -e 'SELECT 1" From 904fff0f1cd1989d6c25cea299b08126ee26fcab Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:42:17 +0100 Subject: [PATCH 06/10] Update deployment.yaml --- apps/pipeline/upstream/mysql/base/deployment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/pipeline/upstream/mysql/base/deployment.yaml b/apps/pipeline/upstream/mysql/base/deployment.yaml index 34c222cf17..893ccf5671 100644 --- a/apps/pipeline/upstream/mysql/base/deployment.yaml +++ b/apps/pipeline/upstream/mysql/base/deployment.yaml @@ -10,6 +10,7 @@ spec: annotations: sidecar.istio.io/inject: "false" spec: + serviceAccountName: mysql containers: - name: mysql env: From 1036aeda8e4eba7fe5801ef85991a8d947159efb Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:43:06 +0100 Subject: [PATCH 07/10] Update kustomization.yaml --- apps/pipeline/upstream/mysql/base/kustomization.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/pipeline/upstream/mysql/base/kustomization.yaml b/apps/pipeline/upstream/mysql/base/kustomization.yaml index c74cef8bea..2e2d7cde82 100644 --- a/apps/pipeline/upstream/mysql/base/kustomization.yaml +++ b/apps/pipeline/upstream/mysql/base/kustomization.yaml @@ -6,6 +6,7 @@ resources: - deployment.yaml - service.yaml - persistent-volume-claim.yaml +- serviceaccount.yaml configMapGenerator: - name: pipeline-mysql-parameters envs: From c6a7a461cd6f898f376d3b29b2b2645c60fe6c34 Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:43:57 +0100 Subject: [PATCH 08/10] Create serviceaccount.yaml --- apps/pipeline/upstream/mysql/base/serviceaccount.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 apps/pipeline/upstream/mysql/base/serviceaccount.yaml diff --git a/apps/pipeline/upstream/mysql/base/serviceaccount.yaml b/apps/pipeline/upstream/mysql/base/serviceaccount.yaml new file mode 100644 index 0000000000..e03c27cfa7 --- /dev/null +++ b/apps/pipeline/upstream/mysql/base/serviceaccount.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: mysql From 1749df4c806e1bb01fa8d63812e15b4d411aa90a Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 25 Feb 2021 14:21:53 +0100 Subject: [PATCH 09/10] Update deployment.yaml --- apps/pipeline/upstream/mysql/base/deployment.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/pipeline/upstream/mysql/base/deployment.yaml b/apps/pipeline/upstream/mysql/base/deployment.yaml index 893ccf5671..2c83e20b8b 100644 --- a/apps/pipeline/upstream/mysql/base/deployment.yaml +++ b/apps/pipeline/upstream/mysql/base/deployment.yaml @@ -12,14 +12,19 @@ spec: spec: serviceAccountName: mysql containers: - - name: mysql + - args: + - --datadir + - /var/lib/mysql/datadir env: - name: MYSQL_ALLOW_EMPTY_PASSWORD value: "true" - image: mysql:5.6 + image: mysql:5.7 + imagePullPolicy: IfNotPresent + name: mysql ports: - containerPort: 3306 name: mysql + protocol: TCP volumeMounts: - mountPath: /var/lib/mysql name: mysql-persistent-storage From fd8c564c01ec0b85e7d312ed9671c68807e0656e Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:03:16 +0100 Subject: [PATCH 10/10] Update deployment.yaml --- .../multi-user/pipelines-profile-controller/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/deployment.yaml b/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/deployment.yaml index dc5530fc31..db8c1069da 100644 --- a/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/deployment.yaml +++ b/apps/pipeline/upstream/installs/multi-user/pipelines-profile-controller/deployment.yaml @@ -36,7 +36,7 @@ spec: - name: hooks mountPath: /hooks ports: - - containerPort: 80 + - containerPort: 8080 volumes: - name: hooks configMap: