Merge branch 'master' into feat/zone-resource-defaults

.circleci/config.yml

@@ -679,8 +679,8 @@ jobs:
 workflows:
   version: 2
   kuma-commit:
-    when:
-      equal: ["", << pipeline.parameters.gh_action_build_artifact_name >>]
+    when: false # Stop running for the moment (likely we'll remove this in the future.
+    # equal: ["", << pipeline.parameters.gh_action_build_artifact_name >>]
     jobs:
       - go_cache:
           name: go_cache-<< matrix.arch >>

.github/workflows/build-test-distribute.yaml

@@ -3,7 +3,7 @@ on:
   push:
     branches: ["master", "release-*", "!*-merge-master"]
     tags: ["*"]
-  pull_request_target:
+  pull_request:
     branches: ["master", "release-*"]
 env:
   K8S_MIN_VERSION: v1.23.17-k3s1
@@ -53,6 +53,7 @@ jobs:
           make dev/tools
       - name: "Check if should run on all arch/os combinations"
         if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'ci/run-full-matrix')
+        id: set-full-matrix-switches
         run: |
           echo 'ENABLED_GOARCHES=arm64 amd64' >> $GITHUB_ENV
           echo 'ENABLED_GOOSES=linux darwin' >> $GITHUB_ENV
@@ -123,6 +124,9 @@ jobs:
     if: ${{ always() }}
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: "Halt due to previous failures"
         if: ${{ contains(needs.*.result, 'failure')|| contains(needs.*.result, 'cancelled') }}
         run: |
@@ -131,21 +135,17 @@ jobs:
           # so we manually check it here. An example could be found here: https://github.com/kumahq/kuma/actions/runs/7044980149
       - name: "Check if should run on all arch/os combinations"
         if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'ci/run-full-matrix')
+        id: set-full-matrix-switches
         run: |
           echo 'ENABLED_GOARCHES=arm64 amd64' >> $GITHUB_ENV
           echo 'ENABLED_GOOSES=linux darwin' >> $GITHUB_ENV
       - name: "Check if force push"
-        if: contains(github.event.pull_request.labels.*.name, 'ci/force-publish')
-        # Open up the following conditions when we don't generate artifacts on CircleCI
-        #  github.event_name == 'push'
+        if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'ci/force-publish')
         run: |
           echo 'ALLOW_PUSH=true' >> $GITHUB_ENV
       - name: Install dependencies for cross builds
         run: |
           sudo apt-get update; sudo apt-get install -y qemu-user-static binfmt-support
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - uses: actions/setup-go@v4
         with:
           go-version-file: go.mod
@@ -164,12 +164,19 @@ jobs:
         run: |
           for i in build/distributions/out/*.tar.gz; do echo $i; tar -tvf $i; done
       - name: Publish distributions to Pulp
+        env:
+          PULP_USERNAME: ${vars.PULP_USERNAME}
+          PULP_PASSWORD: ${secrets.PULP_PASSWORD}
+          CLOUDSMITH_API_KEY: ${secrets.CLOUDSMITH_API_KEY}
         run: |
           make publish/pulp
       - name: Load images
         run: |
           make docker/load
       - name: Publish images
+        env:
+          DOCKER_API_KEY: ${secrets.DOCKER_API_KEY}
+          DOCKER_USERNAME: ${vars.DOCKER_USERNAME}
         run: |-
           make docker/login
           # ensure we always logout
@@ -181,27 +188,31 @@ jobs:
           make docker/manifest
   gen_e2e_matrix:
     runs-on: ubuntu-latest
-    needs: ["build"]
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci/skip-test') && !contains(github.event.pull_request.labels.*.name, 'ci/skip-e2e-test') }}
     outputs:
       test_e2e: ${{ steps.generate-matrix.outputs.test_e2e }}
       test_e2e_env: ${{ steps.generate-matrix.outputs.test_e2e_env }}
     steps:
+      - name: "Check if should run on all arch/os combinations"
+        if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'ci/run-full-matrix')
+        run: |
+          echo 'RUN_FULL_MATRIX=true' >> $GITHUB_ENV
       - name: Install jq
         run: |
           sudo apt-get install -y jq
       - id: generate-matrix
         name: Generate matrix
+        env:
+          # Used in child repo for potential overrides
+          BASE_HOOK: ''
+          MATRIX_SKIP_HOOK: ''
         run: |-
-          BASE_MATRIX_SLOW=$(cat <<-END
-          {
+          BASE_MATRIX_ALL=$(cat <<-END
+          {"test_e2e": {
             "k8sVersion": ["kind", "kindIpv6", "${{ env.K8S_MIN_VERSION }}", "${{ env.K8S_MAX_VERSION }}"],
             "arch": ["amd64", "arm64"]
-          }
-          END
-          )
-          BASE_MATRIX_ENV=$(cat <<-END
-          {
+          },
+          "test_e2e_env": {
             "target": ["kubernetes", "universal", "multizone"],
             "k8sVersion": ["kind", "kindIpv6", "${{ env.K8S_MIN_VERSION }}", "${{ env.K8S_MAX_VERSION }}"],
             "arch": ["amd64", "arm64"],
@@ -219,15 +230,18 @@ jobs:
               {"legacyKDS": true, "k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "multizone", "arch": "amd64", "cniNetworkPlugin": "flannel"},
               {"cniNetworkPlugin": "calico", "k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "multizone", "arch": "amd64", "legacyKDS": false}
             ]
-          }
+          }}
           END
           )
 
-          MATRIX_SLOW=$(echo $BASE_MATRIX_SLOW | jq -rc)
-          MATRIX_ENV=$(echo $BASE_MATRIX_ENV | jq -rc)
+          if [[ "${{ env.BASE_HOOK}}" != "" ]]; then
+            BASE_MATRIX_ALL=$(echo $BASE_MATRIX_ALL | jq -rc "${{ env.BASE_HOOK}}")
+          fi
+
+          MATRIX_SLOW=$(echo $BASE_MATRIX_ALL | jq -rc ".test_e2e")
+          MATRIX_ENV=$(echo $BASE_MATRIX_ALL | jq -rc ".test_e2e_env")
 
-          RUN_FULL_MATRIX="${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'ci/run-full-matrix') }}"
-          if [[ "$RUN_FULL_MATRIX" == "false" ]]; then
+          if [[ "${RUN_FULL_MATRIX}" != "true" ]]; then
             echo "Skipping non priority e2e tests, because no label 'ci/run-full-matrix' was found on the pull request and not pushing on a releasable branch."
 
             MATRIX_SLOW=''  # target==""
@@ -236,13 +250,16 @@ jobs:
             EXCLUDE_ARM64='[{"arch": "arm64"}]'
             EXCLUDE_MAIN_NON_PRIORITY='[{"k8sVersion":"kindIpv6"}, {"k8sVersion": "${{ env.K8S_MIN_VERSION }}"}]'
             MATRIX_ENV=$(echo $MATRIX_ENV | jq -rc "del(.include) | .exclude += $EXCLUDE_ARM64 | .exclude += $EXCLUDE_MAIN_NON_PRIORITY")
+            if [[ "${{ env.MATRIX_SKIP_HOOK }}" != "" ]]; then
+                MATRIX_ENV=$(echo $MATRIX_ENV | jq -rc "${{ env.MATRIX_SKIP_HOOK }}")
+            fi
           fi
 
           echo "test_e2e=$MATRIX_SLOW" >> $GITHUB_OUTPUT
           echo "test_e2e_env=$MATRIX_ENV" >> $GITHUB_OUTPUT
   test_e2e:
     name: "legacy-k8s:${{ matrix.arch }}-${{ matrix.k8sVersion }}"
-    needs: ["gen_e2e_matrix"]
+    needs: ["gen_e2e_matrix", "build"]
     if: needs.gen_e2e_matrix.outputs.test_e2e != ''
     strategy:
       matrix: ${{ fromJSON(needs.gen_e2e_matrix.outputs.test_e2e) }}
@@ -259,7 +276,7 @@ jobs:
       circleCIToken: ${{ secrets.CIRCLECI_TOKEN }}
   test_e2e_env:
     name: "${{ matrix.target }}${{ matrix.cniNetworkPlugin == 'calico' && '-calico' || '' }}:${{ matrix.arch }}-${{ matrix.k8sVersion }}${{ matrix.legacyKDS && '(legacy-kds)' || '' }}"
-    needs: ["gen_e2e_matrix"]
+    needs: ["gen_e2e_matrix", "build"]
     if: needs.gen_e2e_matrix.outputs.test_e2e_env != ''
     strategy:
       matrix: ${{ fromJSON(needs.gen_e2e_matrix.outputs.test_e2e_env) }}

.github/workflows/e2e.yaml

@@ -151,6 +151,9 @@ jobs:
       - name: "CircleCI: trigger a new pipeline workflow on CircleCI"
         if: ${{ inputs.arch != 'amd64' }}
         id: circle-ci-trigger
+        env:
+          # Used in child repo for potential overrides
+          BASE_BODY: '{}'
         run: |
           # Trigger CircleCI manually, reference: https://github.com/CircleCI-Public/trigger-circleci-pipeline-action/blob/main/src/lib/CircleCIPipelineTrigger.ts#L82
           set -e
@@ -159,7 +162,7 @@ jobs:
           fi
 
           BUILD_OUTPUT_ARTIFACT_NAME=build-output
-          BODY='{"parameters": { "e2e_param_k8s_version": "${{ inputs.k8sVersion }}", "e2e_param_arch": "${{ inputs.arch }}", "e2e_param_parallelism": ${{ inputs.parallelism }}, "e2e_param_target": "${{ inputs.target }}", "e2e_param_cni_network_plugin": "${{ inputs.cniNetworkPlugin }}", "e2e_param_legacy_kds": ${{ inputs.legacyKDS }}  } }'
+          BODY=$(echo "${{ env.BASE_BODY }}" | jq -c '.parameters += { "e2e_param_k8s_version": "${{ inputs.k8sVersion }}", "e2e_param_arch": "${{ inputs.arch }}", "e2e_param_parallelism": ${{ inputs.parallelism }}, "e2e_param_target": "${{ inputs.target }}", "e2e_param_cni_network_plugin": "${{ inputs.cniNetworkPlugin }}", "e2e_param_legacy_kds": ${{ inputs.legacyKDS }}  }')
           BODY=$(echo "$BODY" | jq -c ".parameters += { \"gh_action_build_artifact_name\": \"$BUILD_OUTPUT_ARTIFACT_NAME\", \"gh_action_runtime_token\": \"$ACTIONS_RUNTIME_TOKEN\", \"gh_action_artifact_list_url\": \"${ACTIONS_RUNTIME_URL}_apis/pipelines/workflows/${{ github.run_id }}/artifacts?api-version=6.0-preview\" }")
 
           REF_NAME=

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 <!-- Autogenerated with (github.com/kumahq/ci-tools) release-tool changelog.md -->
 
+## 2.5.1
+> Released on 2023/12/05
+
+* feat(dataplane): ignored listeners with ignored labels in selector (backport of #8463) [#8544](https://github.com/kumahq/kuma/pull/8544) @kumahq
+* fix(ZoneIngress): subset routing when tag is present on all subsets (backport of #8443) [#8475](https://github.com/kumahq/kuma/pull/8475) @kumahq
+* fix(metrics): fix kds metrics for simple watchdog (backport of #8428) [#8430](https://github.com/kumahq/kuma/pull/8430) @kumahq
+
+
 ## 2.5.0
 > Released on 2023/11/15