backport of commit 250015d

.changelog/3916.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+control-plane: add missing  `$HOST_IP` environment variable to to consul-dataplane sidecar containers
+```

.changelog/4256.txt

@@ -1,3 +1,3 @@
 ```release-note:improvement
 config-entry: add validate_clusters to mesh config entry
-```
+```

.github/scripts/check_skip_ci.sh

@@ -28,7 +28,7 @@ skip_check_branch=${SKIP_CHECK_BRANCH:?SKIP_CHECK_BRANCH is required}
 files_to_check=$(git diff --name-only "$(git merge-base origin/$skip_check_branch HEAD~)"...HEAD)
 
 # Define the directories to check
-skipped_directories=("assets" ".changelog")
+skipped_directories=("assets" ".changelog" "version")
 
 files_to_skip=("LICENSE" ".copywrite.hcl" ".gitignore")
 

.github/workflows/lint.yaml

@@ -26,29 +26,29 @@ jobs:
           run: echo "GOROOT=$(go env GOROOT)" >> "${GITHUB_ENV}"
 
         - name: golangci-lint-helm-gen
-          uses: golangci/golangci-lint-action@38e1018663fa5173f3968ea0777460d3de38f256 # v5.3.0
+          uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
           with:
             version: "v1.55.2"
             working-directory: hack/helm-reference-gen
             skip-cache: true  # We have seen sticky timeout bugs crop up with caching enabled, so disabling for now
             args: "--no-config --disable-all --enable gofmt,govet"
 
         - name: golangci-lint-control-plane
-          uses: golangci/golangci-lint-action@38e1018663fa5173f3968ea0777460d3de38f256 # v5.3.0
+          uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
           with:
             version: "v1.55.2"
             working-directory: control-plane
             skip-cache: true  # We have seen sticky timeout bugs crop up with caching enabled, so disabling for now
 
         - name: golangci-lint-acceptance
-          uses: golangci/golangci-lint-action@38e1018663fa5173f3968ea0777460d3de38f256 # v5.3.0
+          uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
           with:
             version: "v1.55.2"
             working-directory: acceptance
             skip-cache: true  # We have seen sticky timeout bugs crop up with caching enabled, so disabling for now
 
         - name: golangci-lint-cli
-          uses: golangci/golangci-lint-action@38e1018663fa5173f3968ea0777460d3de38f256 # v5.3.0
+          uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
           with:
             version: "v1.55.2"
             working-directory: acceptance

.github/workflows/merge.yml

@@ -27,4 +27,5 @@ jobs:
         repo: hashicorp/consul-k8s-workflows
         ref: main
         token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
-        inputs: '{ "context":"${{ env.CONTEXT }}", "actor":"${{ github.actor }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'
+        # set "test-ce" to false when a new minor version is released
+        inputs: '{ "test-ce": false, "context":"${{ env.CONTEXT }}", "actor":"${{ github.actor }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'

.github/workflows/nightly-acceptance.yml

@@ -23,4 +23,5 @@ jobs:
         repo: hashicorp/consul-k8s-workflows
         ref: main
         token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
-        inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ github.sha }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'
+        # set "test-ce" to false when a new minor version is released
+        inputs: '{ "test-ce": true, "context":"${{ env.CONTEXT }}", "actor":"${{ github.actor }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'

.github/workflows/pr.yml

@@ -26,8 +26,8 @@ jobs:
         repo: hashicorp/consul-k8s-workflows
         ref: main
         token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
-        inputs: '{ "context":"${{ env.CONTEXT }}", "actor":"${{ github.actor }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'
-
+        # set "test-ce" to false when a new minor version is released
+        inputs: '{ "test-ce": false, "context":"${{ env.CONTEXT }}", "actor":"${{ github.actor }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'
   pass-required-checks-on-skip:
     needs: [ conditional-skip ]
     if: needs.conditional-skip.outputs.skip-ci == 'true'
@@ -44,6 +44,7 @@ jobs:
           - check-name: Unit test control plane
           - check-name: Unit test cli
           - check-name: Unit test acceptance
+          - check-name: Unit test helm gen
     steps:
     - name: Update final status
       uses: docker://ghcr.io/curtbushko/commit-status-action:e1d661c757934ab35c74210b4b70c44099ec747a

.github/workflows/security-scan.yml

@@ -19,7 +19,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-
   get-go-version:
     # Cascades down to test jobs
     uses: ./.github/workflows/reusable-get-go-version.yml
@@ -62,6 +61,6 @@ jobs:
           cat results.sarif | jq
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@c4fb451437765abf5018c6fbf22cce1a7da1e5cc # codeql-bundle-v2.17.1
+        uses: github/codeql-action/upload-sarif@8fcfedf57053e09257688fce7a0beeb18b1b9ae3 # codeql-bundle-v2.17.2
         with:
           sarif_file: results.sarif

.github/workflows/weekly-acceptance-1-1-x.yml

@@ -26,4 +26,5 @@ jobs:
         repo: hashicorp/consul-k8s-workflows
         ref: main
         token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
-        inputs: '{ "context":"${{ env.CONTEXT }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ github.sha }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'
+        # set "test-ce" to false when a new minor version is released
+        inputs: '{ "test-ce": true, "context":"${{ env.CONTEXT }}", "actor":"${{ github.actor }}", "repository":"${{ github.repository }}", "branch":"${{ env.BRANCH }}", "sha":"${{ env.SHA }}", "token":"${{ secrets.ELEVATED_GITHUB_TOKEN }}" }'

.github/workflows/weekly-acceptance-1-4-x.yml → .github/workflows/weekly-acceptance-1-2-x.yml

@@ -1,16 +1,17 @@
 # Dispatch to the consul-k8s-workflows with a weekly cron
 #
 # A separate file is needed for each release because the cron schedules are different for each release.
-name: weekly-acceptance-1-4-x
+name: weekly-acceptance-1-2-x
 on:
   schedule:
     # * is a special character in YAML so you have to quote this string
-    # Run weekly on Thursday at 3AM UTC/11PM EST/8PM PST
-   - cron:  '0 3 * * 4'
+    # Run weekly on Tuesday at 3AM UTC/11PM EST/8PM PST
+    - cron:  '0 3 * * 2'
+
 
 # these should be the only settings that you will ever need to change
 env:
-  BRANCH: "release/1.4.x"
+  BRANCH: "release/1.2.x"
   CONTEXT: "weekly"
 
 jobs:

.gitignore

@@ -11,4 +11,3 @@ pkg/
 .vscode
 .bob/
 control-plane/cni/cni
-acceptance/tests/consul-dns/coredns-custom.yaml