From 040103f95df97bb5e732c0a73c7a633b2e9b5328 Mon Sep 17 00:00:00 2001 From: Loes Immens Date: Thu, 18 Sep 2025 16:21:15 +0200 Subject: [PATCH 1/5] Remove unavailable bitnami images to fix platform cucumber builds Signed-off-by: Loes Immens --- charts/dev/templates/pgweb/deployment.yaml | 10 ---------- charts/gxf-cucumber-tests/templates/job.yaml | 11 ----------- charts/gxf-platform/templates/deployment.yaml | 14 -------------- 3 files changed, 35 deletions(-) diff --git a/charts/dev/templates/pgweb/deployment.yaml b/charts/dev/templates/pgweb/deployment.yaml index a491d9e..6300cd2 100644 --- a/charts/dev/templates/pgweb/deployment.yaml +++ b/charts/dev/templates/pgweb/deployment.yaml @@ -14,16 +14,6 @@ spec: labels: app: pgweb spec: - serviceAccountName: initcontainer-admin-sa - initContainers: - - name: wait-for-dependencies - image: bitnami/kubectl:latest - command: - - kubectl - - rollout - - status - - deployment - - postgres containers: - image: sosedoff/pgweb name: pgweb diff --git a/charts/gxf-cucumber-tests/templates/job.yaml b/charts/gxf-cucumber-tests/templates/job.yaml index 6abcc97..350d72a 100644 --- a/charts/gxf-cucumber-tests/templates/job.yaml +++ b/charts/gxf-cucumber-tests/templates/job.yaml @@ -23,17 +23,6 @@ spec: mountPath: /usr/bin/ - name: report-volume mountPath: /target/output/ - - name: wait-for-dependencies - image: bitnami/kubectl:latest - command: - - kubectl - - rollout - - status - - deployment - - postgres - {{- if $job.dependsOn }} - {{- $job.dependsOn | toYaml | nindent 12 }} - {{- end }} containers: - name: {{ $name }} image: diff --git a/charts/gxf-platform/templates/deployment.yaml b/charts/gxf-platform/templates/deployment.yaml index bcbde04..5669f5d 100644 --- a/charts/gxf-platform/templates/deployment.yaml +++ b/charts/gxf-platform/templates/deployment.yaml @@ -23,20 +23,6 @@ spec: prometheus.io/port: '9404' prometheus.io/scrape: 'true' spec: - serviceAccountName: initcontainer-admin-sa - initContainers: - - name: wait-for-dependencies - image: bitnami/kubectl:latest - command: - - kubectl - - rollout - - status - - deployment - - postgres - - activemq - {{- if $container.dependsOn }} - {{- $container.dependsOn | toYaml | nindent 12 }} - {{- end }} containers: - name: {{ $name }} image: {{ $container.imageRepository | default $.Values.imageRepository | default "ghcr.io/osgp/" }}{{ $container.name }}:{{ $container.imageTag | default $.Values.imageTag | default "latest" }} From b86df8ed3a8d9ae0786ead268c98f3833bf62b63 Mon Sep 17 00:00:00 2001 From: Loes Immens Date: Thu, 18 Sep 2025 16:25:11 +0200 Subject: [PATCH 2/5] Chart version bumps Signed-off-by: Loes Immens --- charts/dev/Chart.yaml | 2 +- charts/gxf-cucumber-tests/Chart.yaml | 2 +- charts/gxf-platform/Chart.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/dev/Chart.yaml b/charts/dev/Chart.yaml index ded8634..8e9b7e5 100644 --- a/charts/dev/Chart.yaml +++ b/charts/dev/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: GXF local development Helm chart name: gxf-local-dev -version: 0.0.3 +version: 0.0.4 maintainers: - name: developers email: gxf@lists.lfenergy.org diff --git a/charts/gxf-cucumber-tests/Chart.yaml b/charts/gxf-cucumber-tests/Chart.yaml index 5a6a8f1..4a9a2b2 100644 --- a/charts/gxf-cucumber-tests/Chart.yaml +++ b/charts/gxf-cucumber-tests/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: GXF cucumber tests Helm chart name: gxf-cucumber-tests -version: 0.0.3 +version: 0.0.4 maintainers: - name: developers email: gxf@lists.lfenergy.org diff --git a/charts/gxf-platform/Chart.yaml b/charts/gxf-platform/Chart.yaml index 061a9e9..a23b87c 100644 --- a/charts/gxf-platform/Chart.yaml +++ b/charts/gxf-platform/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: GXF platform Helm chart name: gxf-platform -version: 0.0.4 +version: 0.0.5 maintainers: - name: developers email: gxf@lists.lfenergy.org From 6fed2e0a8799218e40ee3d962f0f9427b135b7ea Mon Sep 17 00:00:00 2001 From: Loes Immens Date: Thu, 18 Sep 2025 16:37:48 +0200 Subject: [PATCH 3/5] use rancher kubectl image Signed-off-by: Loes Immens --- charts/dev/templates/pgweb/deployment.yaml | 10 ++++++++++ charts/gxf-cucumber-tests/templates/job.yaml | 11 +++++++++++ charts/gxf-platform/templates/deployment.yaml | 14 ++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/charts/dev/templates/pgweb/deployment.yaml b/charts/dev/templates/pgweb/deployment.yaml index 6300cd2..f0b6653 100644 --- a/charts/dev/templates/pgweb/deployment.yaml +++ b/charts/dev/templates/pgweb/deployment.yaml @@ -14,6 +14,16 @@ spec: labels: app: pgweb spec: + serviceAccountName: initcontainer-admin-sa + initContainers: + - name: wait-for-dependencies + image: rancher/kubectl:latest + command: + - kubectl + - rollout + - status + - deployment + - postgres containers: - image: sosedoff/pgweb name: pgweb diff --git a/charts/gxf-cucumber-tests/templates/job.yaml b/charts/gxf-cucumber-tests/templates/job.yaml index 350d72a..7bd17f5 100644 --- a/charts/gxf-cucumber-tests/templates/job.yaml +++ b/charts/gxf-cucumber-tests/templates/job.yaml @@ -23,6 +23,17 @@ spec: mountPath: /usr/bin/ - name: report-volume mountPath: /target/output/ + - name: wait-for-dependencies + image: rancher/kubectl:latest + command: + - kubectl + - rollout + - status + - deployment + - postgres + {{- if $job.dependsOn }} + {{- $job.dependsOn | toYaml | nindent 12 }} + {{- end }} containers: - name: {{ $name }} image: diff --git a/charts/gxf-platform/templates/deployment.yaml b/charts/gxf-platform/templates/deployment.yaml index 5669f5d..79589d3 100644 --- a/charts/gxf-platform/templates/deployment.yaml +++ b/charts/gxf-platform/templates/deployment.yaml @@ -23,6 +23,20 @@ spec: prometheus.io/port: '9404' prometheus.io/scrape: 'true' spec: + serviceAccountName: initcontainer-admin-sa + initContainers: + - name: wait-for-dependencies + image: rancher/kubectl:latest + command: + - kubectl + - rollout + - status + - deployment + - postgres + - activemq + {{- if $container.dependsOn }} + {{- $container.dependsOn | toYaml | nindent 12 }} + {{- end }} containers: - name: {{ $name }} image: {{ $container.imageRepository | default $.Values.imageRepository | default "ghcr.io/osgp/" }}{{ $container.name }}:{{ $container.imageTag | default $.Values.imageTag | default "latest" }} From d1c5c367720a395903d5cb5dedb2aa49dc2aa273 Mon Sep 17 00:00:00 2001 From: Sander Verbruggen Date: Thu, 18 Sep 2025 16:46:45 +0200 Subject: [PATCH 4/5] Rancher doesn't have a "latest" tag, point to a specific (latest ;) ) version Signed-off-by: Sander Verbruggen --- charts/gxf-platform/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gxf-platform/templates/deployment.yaml b/charts/gxf-platform/templates/deployment.yaml index 79589d3..2be13a3 100644 --- a/charts/gxf-platform/templates/deployment.yaml +++ b/charts/gxf-platform/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: serviceAccountName: initcontainer-admin-sa initContainers: - name: wait-for-dependencies - image: rancher/kubectl:latest + image: rancher/kubectl:v1.32.9 command: - kubectl - rollout From 81c87dbf8d64969cf4dbf6c467872dcb0b2fa446 Mon Sep 17 00:00:00 2001 From: Sander Verbruggen Date: Thu, 18 Sep 2025 16:48:40 +0200 Subject: [PATCH 5/5] Rancher doesn't have a "latest" tag, point to a specific (latest ;) ) version Signed-off-by: Sander Verbruggen --- charts/dev/templates/pgweb/deployment.yaml | 2 +- charts/gxf-cucumber-tests/templates/job.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/dev/templates/pgweb/deployment.yaml b/charts/dev/templates/pgweb/deployment.yaml index f0b6653..22477fb 100644 --- a/charts/dev/templates/pgweb/deployment.yaml +++ b/charts/dev/templates/pgweb/deployment.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: initcontainer-admin-sa initContainers: - name: wait-for-dependencies - image: rancher/kubectl:latest + image: rancher/kubectl:v1.32.9 command: - kubectl - rollout diff --git a/charts/gxf-cucumber-tests/templates/job.yaml b/charts/gxf-cucumber-tests/templates/job.yaml index 7bd17f5..e2ac2f1 100644 --- a/charts/gxf-cucumber-tests/templates/job.yaml +++ b/charts/gxf-cucumber-tests/templates/job.yaml @@ -24,7 +24,7 @@ spec: - name: report-volume mountPath: /target/output/ - name: wait-for-dependencies - image: rancher/kubectl:latest + image: rancher/kubectl:v1.32.9 command: - kubectl - rollout