From b1997185aaea136b5e095d4e7e58a54f4a627c9c Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 30 Nov 2022 10:23:29 +1100 Subject: [PATCH 01/15] Updating test suite --- .github/workflows/test-suite.yaml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index beef18c3..91de57f2 100644 --- a/.github/workflows/test-suite.yaml +++ b/.github/workflows/test-suite.yaml @@ -13,26 +13,24 @@ jobs: - active-standby-kubernetes - api - deploytarget - - features-variables - features-kubernetes - features-kubernetes-2 - - tasks - - dbaas + - features-variables + - services - ssh-portal + - tasks ## Re-enable any of these below tests in your branch for specific testing - ## - drupal-php74 - ## - drupal-php80 - ## - drupal-postgres + ## - bitbucket + ## - bulk-deployment ## - drush + ## - generic + ## - github + ## - gitlab ## - image-cache - ## - node-mongodb ## - nginx ## - node ## - python - ## - elasticsearch - ## - github - ## - gitlab - ## - bitbucket + ## - workflows steps: # Continue after getting a shell via: `touch continue` From 4e2cf14472cee91522ff751575e50451e75ed7f9 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 30 Nov 2022 15:54:19 +1100 Subject: [PATCH 02/15] force rerun --- .github/workflows/test-suite.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index 91de57f2..39129b90 100644 --- a/.github/workflows/test-suite.yaml +++ b/.github/workflows/test-suite.yaml @@ -19,7 +19,7 @@ jobs: - services - ssh-portal - tasks - ## Re-enable any of these below tests in your branch for specific testing + ## Re-enable any of these tests in your branch for specific testing ## - bitbucket ## - bulk-deployment ## - drush From 56cda917ea63a571978f21f17c932bddd1864993 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 4 Jan 2023 08:15:34 +1100 Subject: [PATCH 03/15] update kubernetes reqs --- charts/lagoon-build-deploy/Chart.yaml | 6 +++--- charts/lagoon-core/Chart.yaml | 6 +++--- charts/lagoon-logging/Chart.yaml | 6 +++--- charts/lagoon-logs-concentrator/Chart.yaml | 12 ++++++++++-- charts/lagoon-remote/Chart.yaml | 6 +++--- charts/lagoon-test/Chart.yaml | 7 +++++-- charts/lagoon-test/values.yaml | 20 ++++++++++++++++++-- 7 files changed, 45 insertions(+), 18 deletions(-) diff --git a/charts/lagoon-build-deploy/Chart.yaml b/charts/lagoon-build-deploy/Chart.yaml index 32e39b3d..3e1ba553 100644 --- a/charts/lagoon-build-deploy/Chart.yaml +++ b/charts/lagoon-build-deploy/Chart.yaml @@ -12,15 +12,15 @@ maintainers: - name: smlx email: scott.leggett@amazee.io url: https://amazee.io -kubeVersion: ">= 1.19.0-0" +kubeVersion: ">= 1.21.0-0" type: application -version: 0.18.1 +version: 0.19.0 appVersion: v0.7.2 annotations: artifacthub.io/changes: | - kind: changed - description: bump remote-controller to v0.7.2 + description: introduced minimum kubernetes version 1.21 diff --git a/charts/lagoon-core/Chart.yaml b/charts/lagoon-core/Chart.yaml index ea78d9a4..7dc33e95 100644 --- a/charts/lagoon-core/Chart.yaml +++ b/charts/lagoon-core/Chart.yaml @@ -11,7 +11,7 @@ maintainers: - name: shreddedbacon email: ben.jackson@amazee.io url: https://amazee.io -kubeVersion: ">= 1.19.0-0" +kubeVersion: ">= 1.21.0-0" # Application charts are a collection of templates that can be packaged into # versioned archives to be deployed. @@ -21,7 +21,7 @@ type: application # time you make changes to the chart and its templates, including the app # version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.20.0 +version: 1.21.0 # This is the version number of the application being deployed. This version # number should be incremented each time you make changes to the application. @@ -41,4 +41,4 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: Update ssh-portal-api and ssh-token to v0.27.1. + description: introduced minimum kubernetes version 1.21 diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml index 102cf7f4..e5fba8c9 100644 --- a/charts/lagoon-logging/Chart.yaml +++ b/charts/lagoon-logging/Chart.yaml @@ -9,7 +9,7 @@ maintainers: - name: smlx email: scott.leggett@amazee.io url: https://amazee.io -kubeVersion: ">= 1.19.0-0" +kubeVersion: ">= 1.21.0-0" # Application charts are a collection of templates that can be packaged into # versioned archives to be deployed. @@ -19,7 +19,7 @@ type: application # time you make changes to the chart and its templates, including the app # version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.74.0 +version: 0.75.0 dependencies: - name: logging-operator @@ -33,4 +33,4 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: Update logs-dispatcher to v3.3.0. + description: introduced minimum kubernetes version 1.21 diff --git a/charts/lagoon-logs-concentrator/Chart.yaml b/charts/lagoon-logs-concentrator/Chart.yaml index e845a941..1d8b9667 100644 --- a/charts/lagoon-logs-concentrator/Chart.yaml +++ b/charts/lagoon-logs-concentrator/Chart.yaml @@ -9,7 +9,7 @@ maintainers: - name: smlx email: scott.leggett@amazee.io url: https://amazee.io -kubeVersion: ">= 1.19.0-0" +kubeVersion: ">= 1.21.0-0" # Application charts are a collection of templates that can be packaged into # versioned archives to be deployed. @@ -19,4 +19,12 @@ type: application # time you make changes to the chart and its templates, including the app # version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.42.0 +version: 0.43.0 + +# This section is used to collect a changelog for artifacthub.io +# It should be started afresh for each release +# Valid supported kinds are added, changed, deprecated, removed, fixed and security +annotations: + artifacthub.io/changes: | + - kind: changed + description: introduced minimum kubernetes version 1.21 diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index 4c96c2ce..963a18ac 100644 --- a/charts/lagoon-remote/Chart.yaml +++ b/charts/lagoon-remote/Chart.yaml @@ -10,7 +10,7 @@ maintainers: - name: smlx email: scott.leggett@amazee.io url: https://amazee.io -kubeVersion: ">= 1.19.0-0" +kubeVersion: ">= 1.21.0-0" # Application charts are a collection of templates that can be packaged into # versioned archives to be deployed. @@ -19,7 +19,7 @@ type: application # This is the chart version. This version number should be incremented each # time you make changes to the chart and its templates, including the app # version. -version: 0.72.0 +version: 0.73.0 dependencies: - name: lagoon-build-deploy @@ -45,4 +45,4 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: Update ssh-portal to v0.27.1. + description: introduced minimum kubernetes version 1.21 diff --git a/charts/lagoon-test/Chart.yaml b/charts/lagoon-test/Chart.yaml index 86ad6abe..1bcaa8ef 100644 --- a/charts/lagoon-test/Chart.yaml +++ b/charts/lagoon-test/Chart.yaml @@ -7,7 +7,7 @@ maintainers: - name: smlx email: scott.leggett@amazee.io url: https://amazee.io -kubeVersion: ">= 1.19.0-0" +kubeVersion: ">= 1.21.0-0" type: application @@ -21,4 +21,7 @@ appVersion: v2.10.0 annotations: artifacthub.io/changes: | - kind: added - description: Add ssh-token environment variables to test container. + description: added services test and deprecated old tests + - kind: changed + description: introduced minimum kubernetes version 1.21 + diff --git a/charts/lagoon-test/values.yaml b/charts/lagoon-test/values.yaml index 30046d25..0bea382c 100644 --- a/charts/lagoon-test/values.yaml +++ b/charts/lagoon-test/values.yaml @@ -135,7 +135,23 @@ tests: tests: [] # This value is required when suiteEnabled is true, and must be set to one or # more of the valid test suites: - # - features-kubernetes # - active-standby-kubernetes + # - api + # - deploytarget + # - features-kubernetes + # - features-kubernetes-2 + # - features-variables + # - services + # - ssh-portal + # - tasks + # - bitbucket + # - bulk-deployment + # - drush + # - generic + # - github + # - gitlab + # - image-cache # - nginx - # - drupal + # - node + # - python + # - workflows From 1d4c778fc785d2ed2abe689f69b23b5a62e9aed2 Mon Sep 17 00:00:00 2001 From: Scott Leggett Date: Fri, 25 Nov 2022 16:58:54 +0800 Subject: [PATCH 04/15] feat: add new startup probe to api-data-watcher-pusher --- .../local-api-data-watcher-pusher.deployment.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/charts/lagoon-test/templates/local-api-data-watcher-pusher.deployment.yaml b/charts/lagoon-test/templates/local-api-data-watcher-pusher.deployment.yaml index 07b4627d..eadd3040 100644 --- a/charts/lagoon-test/templates/local-api-data-watcher-pusher.deployment.yaml +++ b/charts/lagoon-test/templates/local-api-data-watcher-pusher.deployment.yaml @@ -49,16 +49,13 @@ spec: key: JWTSECRET - name: TOKEN value: {{ required "A valid .Values.token required!" .Values.token | quote }} - readinessProbe: + startupProbe: exec: command: - - /bin/sh - - -c - # this container uses wget to inject test fixtures into the lagoon api. - # once wget stops running, it's good to go. - - "for i in $(seq 4); do pgrep wget && exit 1 || sleep 1; done" - initialDelaySeconds: 32 - timeoutSeconds: 8 + - test + - -f + - /tmp/api-data-pushed + failureThreshold: 90 resources: {{- toYaml .Values.localAPIDataWatcherPusher.resources | nindent 10 }} {{- with .Values.localAPIDataWatcherPusher.nodeSelector }} From 508c6b129276ec1052437e5db436aee6531f72c6 Mon Sep 17 00:00:00 2001 From: Scott Leggett Date: Tue, 13 Dec 2022 10:02:24 +0800 Subject: [PATCH 05/15] chore: bump lagoon-test chart version --- charts/lagoon-test/Chart.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/lagoon-test/Chart.yaml b/charts/lagoon-test/Chart.yaml index 1bcaa8ef..38c29dbe 100644 --- a/charts/lagoon-test/Chart.yaml +++ b/charts/lagoon-test/Chart.yaml @@ -11,7 +11,7 @@ kubeVersion: ">= 1.21.0-0" type: application -version: 0.41.0 +version: 0.42.0 appVersion: v2.10.0 @@ -24,4 +24,5 @@ annotations: description: added services test and deprecated old tests - kind: changed description: introduced minimum kubernetes version 1.21 - + - kind: changed + description: Use new startup probe on api-data-watcher-pusher. From c28b0440252884db3fb9f192323b9c9d1ecf439c Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 20 Jan 2023 16:47:04 +1100 Subject: [PATCH 06/15] lagoon-remote chart version bump --- charts/lagoon-remote/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index 963a18ac..20acc22a 100644 --- a/charts/lagoon-remote/Chart.yaml +++ b/charts/lagoon-remote/Chart.yaml @@ -19,7 +19,7 @@ type: application # This is the chart version. This version number should be incremented each # time you make changes to the chart and its templates, including the app # version. -version: 0.73.0 +version: 0.74.0 dependencies: - name: lagoon-build-deploy From 4cee30a5ec6ba9f29b59763358693fb988a14c8c Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 23 Jan 2023 12:14:21 +1100 Subject: [PATCH 07/15] use updated APIdwp image --- charts/lagoon-test/ci/linter-values.yaml.tpl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/lagoon-test/ci/linter-values.yaml.tpl b/charts/lagoon-test/ci/linter-values.yaml.tpl index 221725a5..4ea7a4d7 100644 --- a/charts/lagoon-test/ci/linter-values.yaml.tpl +++ b/charts/lagoon-test/ci/linter-values.yaml.tpl @@ -11,9 +11,14 @@ localGit: image: repository: ${imageRegistry}/local-git +# localAPIDataWatcherPusher: +# image: +# repository: ${imageRegistry}/local-api-data-watcher-pusher + localAPIDataWatcherPusher: image: - repository: ${imageRegistry}/local-api-data-watcher-pusher + repository: testlagoon/local-api-data-watcher-pusher + tag: main tests: image: From 3771e940ec8c165e31705e382f7ad9dcb39aeee0 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 23 Jan 2023 14:28:28 +1100 Subject: [PATCH 08/15] use testlagoon for tests image --- charts/lagoon-test/ci/linter-values.yaml.tpl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/charts/lagoon-test/ci/linter-values.yaml.tpl b/charts/lagoon-test/ci/linter-values.yaml.tpl index 4ea7a4d7..a964b5c6 100644 --- a/charts/lagoon-test/ci/linter-values.yaml.tpl +++ b/charts/lagoon-test/ci/linter-values.yaml.tpl @@ -20,9 +20,15 @@ localAPIDataWatcherPusher: repository: testlagoon/local-api-data-watcher-pusher tag: main +# tests: +# image: +# repository: ${imageRegistry}/tests +# tests: ${tests} + tests: image: - repository: ${imageRegistry}/tests + repository: testlagoon/tests + tag: main tests: ${tests} imageTag: ${imageTag} From 3104685c261cfc1599beee492da45412a61f105c Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 23 Jan 2023 15:01:06 +1100 Subject: [PATCH 09/15] fix test suite --- .github/workflows/test-suite.yaml | 2 +- charts/lagoon-test/ci/linter-values.yaml.tpl | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index 3ec1a906..7b5a6734 100644 --- a/.github/workflows/test-suite.yaml +++ b/.github/workflows/test-suite.yaml @@ -17,7 +17,6 @@ jobs: - features-kubernetes-2 - features-variables - services - - ssh-portal - tasks ## Re-enable any of these tests in your branch for specific testing ## - bitbucket @@ -30,6 +29,7 @@ jobs: ## - nginx ## - node ## - python + ## - ssh-legacy ## - workflows steps: diff --git a/charts/lagoon-test/ci/linter-values.yaml.tpl b/charts/lagoon-test/ci/linter-values.yaml.tpl index a964b5c6..6dc02700 100644 --- a/charts/lagoon-test/ci/linter-values.yaml.tpl +++ b/charts/lagoon-test/ci/linter-values.yaml.tpl @@ -7,9 +7,14 @@ token: "${token}" webhookHost: "${webhookHandler}" webhookRepoPrefix: "${webhookRepoPrefix}" +# localGit: +# image: +# repository: ${imageRegistry}/local-git + localGit: image: - repository: ${imageRegistry}/local-git + repository: testlagoon/local-git + tag: main # localAPIDataWatcherPusher: # image: From b1bf7066b8edd7dab87823ce2d7c8efa6ffacc7a Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Tue, 31 Jan 2023 12:53:31 +1100 Subject: [PATCH 10/15] update docker-host image to v3.2.0 --- charts/lagoon-remote/Chart.yaml | 2 ++ charts/lagoon-remote/values.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index 20acc22a..da5d5632 100644 --- a/charts/lagoon-remote/Chart.yaml +++ b/charts/lagoon-remote/Chart.yaml @@ -46,3 +46,5 @@ annotations: artifacthub.io/changes: | - kind: changed description: introduced minimum kubernetes version 1.21 + - kind: changed + description: update docker-host image to v3.2.0 diff --git a/charts/lagoon-remote/values.yaml b/charts/lagoon-remote/values.yaml index 6d95d38a..bd375a16 100644 --- a/charts/lagoon-remote/values.yaml +++ b/charts/lagoon-remote/values.yaml @@ -27,7 +27,7 @@ dockerHost: repository: uselagoon/docker-host pullPolicy: Always # Overrides the image tag whose default is "latest". - tag: "v3.1.0" + tag: "v3.2.0" name: docker-host From a25febd44bff4345ad96b81e593263106bcd08f0 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Thu, 2 Feb 2023 15:29:27 +1100 Subject: [PATCH 11/15] update docker-host image to v3.3.0 --- charts/lagoon-remote/Chart.yaml | 2 +- charts/lagoon-remote/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index da5d5632..d2a26190 100644 --- a/charts/lagoon-remote/Chart.yaml +++ b/charts/lagoon-remote/Chart.yaml @@ -47,4 +47,4 @@ annotations: - kind: changed description: introduced minimum kubernetes version 1.21 - kind: changed - description: update docker-host image to v3.2.0 + description: update docker-host image to v3.3.0 diff --git a/charts/lagoon-remote/values.yaml b/charts/lagoon-remote/values.yaml index bd375a16..f5d08216 100644 --- a/charts/lagoon-remote/values.yaml +++ b/charts/lagoon-remote/values.yaml @@ -27,7 +27,7 @@ dockerHost: repository: uselagoon/docker-host pullPolicy: Always # Overrides the image tag whose default is "latest". - tag: "v3.2.0" + tag: "v3.3.0" name: docker-host From 6b8c339c1bb0040b708d41dbac7b1eefa332e301 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 3 Feb 2023 11:13:58 +1100 Subject: [PATCH 12/15] use lagoon-core appVersion v2.12.0 --- charts/lagoon-core/Chart.yaml | 4 +++- charts/lagoon-test/Chart.yaml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/lagoon-core/Chart.yaml b/charts/lagoon-core/Chart.yaml index 2e6660c9..117e4583 100644 --- a/charts/lagoon-core/Chart.yaml +++ b/charts/lagoon-core/Chart.yaml @@ -27,7 +27,7 @@ version: 1.23.0 # number should be incremented each time you make changes to the application. # Versions are not expected to follow Semantic Versioning. They should reflect # the version the application is using. -appVersion: v2.11.0 +appVersion: v2.12.0 dependencies: - name: nats @@ -42,3 +42,5 @@ annotations: artifacthub.io/changes: | - kind: changed description: introduced minimum kubernetes version 1.21 + - kind: changed + description: update Lagoon appVersion to v2.12.0 diff --git a/charts/lagoon-test/Chart.yaml b/charts/lagoon-test/Chart.yaml index 38c29dbe..8dfcc991 100644 --- a/charts/lagoon-test/Chart.yaml +++ b/charts/lagoon-test/Chart.yaml @@ -13,7 +13,7 @@ type: application version: 0.42.0 -appVersion: v2.10.0 +appVersion: v2.12.0 # This section is used to collect a changelog for artifacthub.io # It should be started afresh for each release @@ -26,3 +26,5 @@ annotations: description: introduced minimum kubernetes version 1.21 - kind: changed description: Use new startup probe on api-data-watcher-pusher. + - kind: changed + description: update Lagoon appVersion to v2.12.0 From a9df50f83934227ccda8da0d57a284d425e5929e Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 3 Feb 2023 12:01:02 +1100 Subject: [PATCH 13/15] update lagoon-build-deploy chart to v0.19.0 --- charts/lagoon-remote/Chart.lock | 6 +++--- charts/lagoon-remote/Chart.yaml | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/charts/lagoon-remote/Chart.lock b/charts/lagoon-remote/Chart.lock index 70f738f7..ff38a176 100644 --- a/charts/lagoon-remote/Chart.lock +++ b/charts/lagoon-remote/Chart.lock @@ -1,7 +1,7 @@ dependencies: - name: lagoon-build-deploy repository: https://uselagoon.github.io/lagoon-charts/ - version: 0.18.1 + version: 0.19.0 - name: dioscuri repository: https://amazeeio.github.io/charts/ version: 0.4.1 @@ -11,5 +11,5 @@ dependencies: - name: nats repository: https://nats-io.github.io/k8s/helm/charts/ version: 0.18.3 -digest: sha256:1018b08ca55534e25872062782c15d58d4ae03129374ce015e62306ce319b353 -generated: "2022-11-24T11:53:05.091683188+11:00" +digest: sha256:8a65f7fdd1dd221e3e780b71b9c3e31e6918cb93f6e652527afc6302c294ab34 +generated: "2023-02-03T12:00:16.291578794+11:00" diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index d2a26190..bab52198 100644 --- a/charts/lagoon-remote/Chart.yaml +++ b/charts/lagoon-remote/Chart.yaml @@ -23,7 +23,7 @@ version: 0.74.0 dependencies: - name: lagoon-build-deploy - version: ~0.18.0 + version: ~0.19.0 repository: https://uselagoon.github.io/lagoon-charts/ condition: lagoon-build-deploy.enabled - name: dioscuri @@ -48,3 +48,5 @@ annotations: description: introduced minimum kubernetes version 1.21 - kind: changed description: update docker-host image to v3.3.0 + - kind: changed + description: update lagoon-build-deploy chart to v0.19.0 From 7ffed32d3542c33b94c7fec4d10c4b09526f080a Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 3 Feb 2023 17:29:41 +1100 Subject: [PATCH 14/15] remove linter overrides --- charts/lagoon-core/ci/linter-values.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/charts/lagoon-core/ci/linter-values.yaml b/charts/lagoon-core/ci/linter-values.yaml index b45baa19..4d8f1d1d 100644 --- a/charts/lagoon-core/ci/linter-values.yaml +++ b/charts/lagoon-core/ci/linter-values.yaml @@ -23,13 +23,6 @@ defaultIngressClassName: nginx lagoonAPIURL: https://api.example.com/graphql keycloakAPIURL: https://keycloak.example.com/auth -buildDeployImage: - default: - image: uselagoon/build-deploy-image:latest - edge: - enabled: true - image: uselagoon/build-deploy-image:edge - api: replicaCount: 1 image: @@ -84,14 +77,11 @@ ui: replicaCount: 1 image: repository: uselagoon/ui - tag: main backupHandler: replicaCount: 1 image: repository: uselagoon/backup-handler - autoscaling: - enabled: true insightsHandler: image: From 7537ae263ce22a6e29c3f275d2f47e28f2fbb526 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 3 Feb 2023 18:13:00 +1100 Subject: [PATCH 15/15] fixup test image overrides --- charts/lagoon-test/ci/linter-values.yaml.tpl | 22 +++----------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/charts/lagoon-test/ci/linter-values.yaml.tpl b/charts/lagoon-test/ci/linter-values.yaml.tpl index 6dc02700..221725a5 100644 --- a/charts/lagoon-test/ci/linter-values.yaml.tpl +++ b/charts/lagoon-test/ci/linter-values.yaml.tpl @@ -7,33 +7,17 @@ token: "${token}" webhookHost: "${webhookHandler}" webhookRepoPrefix: "${webhookRepoPrefix}" -# localGit: -# image: -# repository: ${imageRegistry}/local-git - localGit: image: - repository: testlagoon/local-git - tag: main - -# localAPIDataWatcherPusher: -# image: -# repository: ${imageRegistry}/local-api-data-watcher-pusher + repository: ${imageRegistry}/local-git localAPIDataWatcherPusher: image: - repository: testlagoon/local-api-data-watcher-pusher - tag: main - -# tests: -# image: -# repository: ${imageRegistry}/tests -# tests: ${tests} + repository: ${imageRegistry}/local-api-data-watcher-pusher tests: image: - repository: testlagoon/tests - tag: main + repository: ${imageRegistry}/tests tests: ${tests} imageTag: ${imageTag}