chore: fix merge conflicts

uselagoon · Nov 20, 2023 · 314ff85 · 314ff85
2 parents ac51b9a + 30b573f
commit 314ff85
Show file tree

Hide file tree

Showing 108 changed files with 1,289 additions and 2,719 deletions.
diff --git a/.github/workflows/lint-test-matrix.yaml b/.github/workflows/lint-test-matrix.yaml
@@ -11,22 +11,22 @@ jobs:
       fail-fast: false
       matrix:
         kindest_node_version:
-        - v1.21.14@sha256:9d9eb5fb26b4fbc0c6d95fa8c790414f9750dd583f5d7cee45d92e8c26670aa1
-        - v1.22.15@sha256:7d9708c4b0873f0fe2e171e2b1b7f45ae89482617778c1c875f1053d4cef2e41
-        - v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61
-        - v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1
-        - v1.26.0@sha256:691e24bd2417609db7e589e1a479b902d2e209892a10ce375fab60a8407c7352
+        - v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb
+        - v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab
+        - v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
+        - v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
+        - v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: "0"
 
     - name: Set up chart-testing dependencies
       run: sudo apt-get -y install python3-wheel
 
     - name: Set up chart-testing
-      uses: helm/chart-testing-action@v2.4.0
+      uses: helm/chart-testing-action@v2.6.0
 
     - name: Run chart-testing (list-changed)
       id: list-changed
@@ -41,13 +41,18 @@ jobs:
       run: ct lint --config ./default.ct.yaml
 
     - name: Create kind cluster
-      uses: helm/kind-action@v1.5.0
+      uses: helm/kind-action@v1.8.0
       with:
-        version: v0.17.0
+        version: v0.20.0
         node_image: kindest/node:${{ matrix.kindest_node_version }}
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
         (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
 
     - name: Run chart-testing (install)
-      run: ct install --config ./default.ct.yaml
+      run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m"
+
+    - name: Run chart-testing (needs-testing)
+      run: ct install --config ./default.ct.yaml  --helm-extra-args "--timeout 30m" --all
+      if: |
+        (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Install Helm
       run: |
         cd /tmp
@@ -19,16 +19,14 @@ jobs:
         helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com
         helm repo add lagoon https://uselagoon.github.io/lagoon-charts/
         helm repo add amazeeio https://amazeeio.github.io/charts/
-        helm repo add gatekeeper https://open-policy-agent.github.io/gatekeeper/charts
         helm repo add nats https://nats-io.github.io/k8s/helm/charts/
+        helm repo add kube-logging https://kube-logging.github.io/helm-charts
     - name: Generate helm templates
       run: |
         cd charts
         # hacky workaround for lagoon-test templated values
         tests=[foo,bar] envsubst '$tests' < lagoon-test/ci/linter-values.yaml.tpl > lagoon-test/ci/linter-values.yaml
 
-        # don't lint lagoon-gatekeeper
-        rm -rf lagoon-gatekeeper
         for chart in *; do
           helm dependency build $chart
           mkdir -p /tmp/charts/$chart
@@ -37,11 +35,6 @@ jobs:
             --output-dir /tmp/charts/$chart
         done
 
-        # workaround until gatekeeper templates are fixed:
-        # * https://github.com/open-policy-agent/gatekeeper/pull/1114
-        # * https://github.com/open-policy-agent/gatekeeper/pull/1115
-        rm -rf /tmp/charts/lagoon-gatekeeper/lagoon-gatekeeper/charts/gatekeeper
-        rm -rf /tmp/charts/lagoon-remote/lagoon-remote/charts/lagoon-gatekeeper/charts/gatekeeper
         # workaround until logging-operator templates are fixed:
         # https://github.com/banzaicloud/logging-operator/pull/792
         rm -rf /tmp/charts/lagoon-logging/lagoon-logging/charts/logging-operator
@@ -68,15 +61,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: "0"
 
     - name: Set up chart-testing dependencies
       run: sudo apt-get -y install python3-wheel
 
     - name: Set up chart-testing
-      uses: helm/chart-testing-action@v2.4.0
+      uses: helm/chart-testing-action@v2.6.0
 
     - name: Run chart-testing (list-changed)
       id: list-changed
@@ -91,31 +84,32 @@ jobs:
       run: ct lint --config ./default.ct.yaml
 
     - name: Create kind cluster
-      uses: helm/kind-action@v1.5.0
+      uses: helm/kind-action@v1.8.0
       with:
-        version: v0.17.0
-        node_image: kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315
+        version: v0.20.0
+        node_image: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
+        kubectl_version: v1.27.3
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
         (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
 
     - name: Run chart-testing (install)
-      run: ct install --config ./default.ct.yaml
+      run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m"
 
   artifacthub-changelog:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: "0"
 
     - name: Install gojq
       run: |
         cd /tmp
-        curl -sSLO https://github.com/itchyny/gojq/releases/download/v0.12.10/gojq_v0.12.10_linux_amd64.tar.gz
-        tar -xf ./gojq_v0.12.10_linux_amd64.tar.gz
-        sudo cp /tmp/gojq_v0.12.10_linux_amd64/gojq /usr/local/bin/gojq
+        curl -sSLO https://github.com/itchyny/gojq/releases/download/v0.12.13/gojq_v0.12.13_linux_amd64.tar.gz
+        tar -xf ./gojq_v0.12.13_linux_amd64.tar.gz
+        sudo cp /tmp/gojq_v0.12.13_linux_amd64/gojq /usr/local/bin/gojq
 
     - name: Run artifacthub.io changelog check
       run: |

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: "0"
 
@@ -31,8 +31,8 @@ jobs:
         helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com
         helm repo add lagoon https://uselagoon.github.io/lagoon-charts/
         helm repo add amazeeio https://amazeeio.github.io/charts/
-        helm repo add gatekeeper https://open-policy-agent.github.io/gatekeeper/charts
         helm repo add nats https://nats-io.github.io/k8s/helm/charts/
+        helm repo add kube-logging https://kube-logging.github.io/helm-charts
 
     - name: Run chart-releaser
       uses: helm/[email protected]

diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml
@@ -5,7 +5,7 @@ on: pull_request
 jobs:
   # runs for lagoon-core, lagoon-remote, lagoon-test
   test-suite:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -40,15 +40,15 @@ jobs:
       continue-on-error: true
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: "0"
 
     - name: Set up chart-testing dependencies
       run: sudo apt-get -y install python3-wheel
 
     - name: Set up chart-testing
-      uses: helm/chart-testing-action@v2.4.0
+      uses: helm/chart-testing-action@v2.6.0
 
     - name: Run chart-testing (list-changed)
       id: list-changed
@@ -69,15 +69,15 @@ jobs:
         envsubst < test-suite.kind-config.yaml.tpl > test-suite.kind-config.yaml
 
     - name: Create kind cluster
-      uses: helm/kind-action@v1.5.0
+      uses: helm/kind-action@v1.8.0
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
         (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
       with:
-        version: v0.17.0
-        node_image: kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315
+        version: v0.20.0
+        node_image: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
+        kubectl_version: v1.27.3
         config: test-suite.kind-config.yaml
-        kubectl_version: v1.24.7
 
     - name: Check node IP matches kind configuration
       if: |
@@ -97,7 +97,6 @@ jobs:
         helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
         helm repo add stable https://charts.helm.sh/stable
         helm repo add bitnami https://charts.bitnami.com/bitnami
-        helm repo add gatekeeper https://open-policy-agent.github.io/gatekeeper/charts
         helm repo add amazeeio https://amazeeio.github.io/charts/
         helm repo add lagoon https://uselagoon.github.io/lagoon-charts/
         helm repo add nats https://nats-io.github.io/k8s/helm/charts/
@@ -108,15 +107,15 @@ jobs:
         (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
       run: |
         cd /tmp
-        curl -sSLO https://github.com/itchyny/gojq/releases/download/v0.12.9/gojq_v0.12.9_linux_amd64.tar.gz
-        tar -xf ./gojq_v0.12.9_linux_amd64.tar.gz
-        sudo cp /tmp/gojq_v0.12.9_linux_amd64/gojq /usr/local/bin/jq
+        curl -sSLO https://github.com/itchyny/gojq/releases/download/v0.12.13/gojq_v0.12.13_linux_amd64.tar.gz
+        tar -xf ./gojq_v0.12.13_linux_amd64.tar.gz
+        sudo cp /tmp/gojq_v0.12.13_linux_amd64/gojq /usr/local/bin/jq
 
     - name: Install kubens and kubectl alias
       run: |
         cd /tmp
-        curl -sSLO https://github.com/ahmetb/kubectx/releases/download/v0.9.4/kubens_v0.9.4_linux_x86_64.tar.gz
-        tar -xf ./kubens_v0.9.4_linux_x86_64.tar.gz
+        curl -sSLO https://github.com/ahmetb/kubectx/releases/download/v0.9.5/kubens_v0.9.5_linux_x86_64.tar.gz
+        tar -xf ./kubens_v0.9.5_linux_x86_64.tar.gz
         sudo cp /tmp/kubens /usr/local/bin/kubens
         sudo ln -s $(which kubectl) /usr/local/bin/kc
 
@@ -137,7 +136,9 @@ jobs:
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
         (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
-      run: ct lint-and-install --config ./test-suite-run.ct.yaml
+      run: |
+        ct lint --config ./test-suite-run.ct.yaml
+        ct install --config ./test-suite-run.ct.yaml --helm-extra-args "--timeout 60m"
 
     # the following steps gather various debug information on test failure
 

diff --git a/Makefile b/Makefile
@@ -83,7 +83,7 @@ install-ingress:
 		--set controller.config.hsts="false" \
 		--set controller.watchIngressWithoutClass=true \
 		--set controller.ingressClassResource.default=true \
-		--version=4.5.2 \
+		--version=4.7.2 \
 		ingress-nginx \
 		ingress-nginx/ingress-nginx
 
@@ -103,7 +103,7 @@ install-registry: install-ingress
 		--set clair.enabled=false \
 		--set notary.enabled=false \
 		--set trivy.enabled=false \
-		--version=1.11.0 \
+		--version=1.13.0 \
 		registry \
 		harbor/harbor
 
@@ -117,7 +117,7 @@ install-mariadb:
 		--wait \
 		--timeout $(TIMEOUT) \
 		$$($(KUBECTL) get ns mariadb > /dev/null 2>&1 && echo --set auth.rootPassword=$$($(KUBECTL) get secret --namespace mariadb mariadb -o json | $(JQ) -r '.data."mariadb-root-password" | @base64d')) \
-		--version=11.4.7 \
+		--version=12.2.9 \
 		mariadb \
 		bitnami/mariadb
 
@@ -159,7 +159,7 @@ install-minio: install-ingress
 		--timeout $(TIMEOUT) \
 		--set auth.rootUser=lagoonFilesAccessKey,auth.rootPassword=lagoonFilesSecretKey \
 		--set defaultBuckets=lagoon-files \
-		--version=12.1.7 \
+		--version=12.8.7 \
 		minio \
 		bitnami/minio
 
@@ -178,7 +178,7 @@ install-lagoon-core: install-minio
 		$$([ $(OVERRIDE_BUILD_DEPLOY_DIND_IMAGE) ] && echo '--set buildDeployImage.default.image=$(OVERRIDE_BUILD_DEPLOY_DIND_IMAGE)') \
 		$$([ $(DISABLE_CORE_HARBOR) ] && echo '--set api.additionalEnvs.DISABLE_CORE_HARBOR=$(DISABLE_CORE_HARBOR)') \
 		$$([ $(OPENSEARCH_INTEGRATION_ENABLED) ] && echo '--set api.additionalEnvs.OPENSEARCH_INTEGRATION_ENABLED=$(OPENSEARCH_INTEGRATION_ENABLED)') \
-		--set "keycloakAPIURL=http://lagoon-keycloak.$$($(KUBECTL) get nodes -o jsonpath='{.items[0].status.addresses[0].address}').nip.io:32080/auth" \
+		--set "keycloakFrontEndURL=http://lagoon-keycloak.$$($(KUBECTL) get nodes -o jsonpath='{.items[0].status.addresses[0].address}').nip.io:32080" \
 		--set "lagoonAPIURL=http://lagoon-api.$$($(KUBECTL) get nodes -o jsonpath='{.items[0].status.addresses[0].address}').nip.io:32080/graphql" \
 		--set actionsHandler.image.repository=$(IMAGE_REGISTRY)/actions-handler  \
 		--set api.image.repository=$(IMAGE_REGISTRY)/api \

diff --git a/charts/lagoon-build-deploy/Chart.yaml b/charts/lagoon-build-deploy/Chart.yaml
@@ -12,15 +12,15 @@ maintainers:
 - name: smlx
   email: [email protected]
   url: https://amazee.io
-kubeVersion: ">= 1.21.0-0"
+kubeVersion: ">= 1.23.0-0"
 
 type: application
 
-version: 0.22.0
+version: 0.26.2
 
-appVersion: v0.12.0
+appVersion: v0.15.4
 
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update remote-controller appVersion to v0.12.0
+      description: update remote-controller to v0.15.4
diff --git a/charts/lagoon-build-deploy/ci/linter-values.yaml b/charts/lagoon-build-deploy/ci/linter-values.yaml
@@ -2,6 +2,8 @@ rabbitMQUsername: lagoon
 rabbitMQPassword: ci
 rabbitMQHostname: lagoon-core-broker
 lagoonTargetName: ci-local-control-k8s
-taskSSHHost: lagoon-core-ssh.lagoon.svc
-taskSSHPort: 2020
-taskAPIHost: http://lagoon-core-api.lagoon.svc:80
+sshPortalHost: lagoon-remote-ssh-portal.lagoon.svc
+sshPortalPort: 22
+lagoonTokenHost: lagoon-core-token.lagoon.svc
+lagoonTokenPort: 22
+lagoonAPIHost: http://lagoon-core-api.lagoon.svc:80
diff --git a/charts/lagoon-build-deploy/crds/crd.lagoon.sh_lagoontasks.yaml b/charts/lagoon-build-deploy/crds/crd.lagoon.sh_lagoontasks.yaml
@@ -108,6 +108,17 @@ spec:
                     type: string
                   namespacePattern:
                     type: string
+                  variables:
+                    description: Variables contains the project and environment variables
+                      from lagoon.
+                    properties:
+                      environment:
+                        format: byte
+                        type: string
+                      project:
+                        format: byte
+                        type: string
+                    type: object
                 required:
                 - id
                 - name

diff --git a/charts/lagoon-build-deploy/templates/deployment.yaml b/charts/lagoon-build-deploy/templates/deployment.yaml
@@ -119,6 +119,9 @@ spec:
         {{- with .Values.lagoonFeatureFlagBackupWeeklyRandom }}
         - "--lagoon-feature-flag-backup-weekly-random={{ . }}"
         {{- end }}
+        {{- with .Values.lagoonFeatureFlagSupportK8upV2 }}
+        - "--lagoon-feature-flag-support-k8upv2={{ . }}"
+        {{- end }}
         {{- with .Values.lagoonBackupDefaultSchedule }}
         - "--backup-default-schedule={{ . }}"
         {{- end }}
@@ -178,15 +181,29 @@ spec:
         - name: OVERRIDE_BUILD_DEPLOY_DIND_IMAGE
           value: {{ . | quote }}
         {{- end }}
-        {{- with .Values.taskSSHHost }}
+        {{- with .Values.sshPortalHost | default .Values.taskSSHHost}}
+        - name: LAGOON_CONFIG_SSH_HOST
+          value: {{ . | quote }}
+        {{- end }}
+        {{- with .Values.sshPortalPort | default .Values.taskSSHPort }}
+        - name: LAGOON_CONFIG_SSH_PORT
+          value: {{ . | quote }}
+        {{- end }}
+        {{- with .Values.lagoonTokenHost | default .Values.taskSSHHost }}
+        - name: LAGOON_CONFIG_TOKEN_HOST
+          value: {{ . | quote }}
         - name: TASK_SSH_HOST
           value: {{ . | quote }}
         {{- end }}
-        {{- with .Values.taskSSHPort }}
+        {{- with .Values.lagoonTokenPort | default .Values.taskSSHPort }}
+        - name: LAGOON_CONFIG_TOKEN_PORT
+          value: {{ . | quote }}
         - name: TASK_SSH_PORT
           value: {{ . | quote }}
         {{- end }}
-        {{- with .Values.taskAPIHost }}
+        {{- with .Values.lagoonAPIHost | default .Values.taskAPIHost }}
+        - name: LAGOON_CONFIG_API_HOST
+          value: {{ . | quote }}
         - name: TASK_API_HOST
           value: {{ . | quote }}
         {{- end }}