backport of commit 8fd981f

.changelog/106.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+Fix a bug that threw an error when trying to use `$HOST_IP` with metrics URLs.
+```

.changelog/99.txt

@@ -0,0 +1,3 @@
+```release-note:security
+Update to Go 1.20.4 and Envoy 1.24.7 within the Dockerfile. 
+```

.github/workflows/build.yml

@@ -21,26 +21,26 @@ jobs:
     outputs:
       go-version: ${{ steps.get-go-version.outputs.go-version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Determine Go version
         id: get-go-version
         # We use .go-version as our source of truth for current Go
         # version, because "goenv" can react to it automatically.
         run: |
           echo "Building with Go $(cat .go-version)"
-          echo "go-version=$(cat .go-version)" >> $GITHUB_OUTPUT
+          echo "::set-output name=go-version::$(cat .go-version)"
 
   get-product-version:
     runs-on: ubuntu-latest
     outputs:
       product-version: ${{ steps.get-product-version.outputs.product-version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: get product version
         id: get-product-version
         run: |
           make version
-          echo "product-version=$(make version)" >> $GITHUB_OUTPUT
+          echo "::set-output name=product-version::$(make version)"
 
   generate-metadata-file:
     needs: get-product-version
@@ -49,7 +49,7 @@ jobs:
       filepath: ${{ steps.generate-metadata-file.outputs.filepath }}
     steps:
       - name: "Checkout directory"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: Generate metadata file
         id: generate-metadata-file
         uses: hashicorp/actions-generate-metadata@v1
@@ -77,7 +77,7 @@ jobs:
     name: Go ${{ needs.get-go-version.outputs.go-version }} ${{ matrix.goos }} ${{ matrix.goarch }} build
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - uses: hashicorp/actions-go-build@v0.1.3
         with:
@@ -140,7 +140,7 @@ jobs:
       GOARCH: ${{ matrix.goarch }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - uses: hashicorp/actions-go-build@v0.1.3
         with:
@@ -168,7 +168,7 @@ jobs:
       version: ${{ needs.get-product-version.outputs.product-version }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       # Strip everything but MAJOR.MINOR from the version string and add a `-dev` suffix
       # This naming convention will be used ONLY for per-commit dev images
@@ -208,7 +208,7 @@ jobs:
       version: ${{needs.get-product-version.outputs.product-version}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - uses: hashicorp/actions-docker-build@v1
         with:
           version: ${{env.version}}
@@ -229,7 +229,7 @@ jobs:
       repo: ${{ github.event.repository.name }}
       version: ${{ needs.get-product-version.outputs.product-version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       # Strip everything but MAJOR.MINOR from the version string and add a `-dev` suffix
       # This naming convention will be used ONLY for per-commit dev images
       - name: Set docker dev tag
@@ -269,10 +269,6 @@ jobs:
         server:
           - version: v1.14.4
             image: docker.mirror.hashicorp.services/hashicorp/consul:1.14.4
-          - version: v1.15.0-dev
-            image: hashicorppreview/consul:1.15-dev
-          - version: v1.16.0-dev
-            image: hashicorppreview/consul:1.16-dev
         dataplane:
           - image_suffix: "dev"
             docker_target: "release-default"
@@ -296,9 +292,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: ${{ needs.get-go-version.outputs.go-version }}
+          go-version: '1.20'
       - id: run-tests
-        run: cd integration-tests && go test -v -output-dir=./output -dataplane-image=hashicorppreview/${{env.repo}}:${{env.dev_tag}}-${{github.sha}} -server-image=${{matrix.server.image}} -server-version=${{matrix.server.version}}
+        run: cd integration-tests && go test -v -output-dir=./output -dataplane-image=hashicorppreview/${{env.repo}}:${{env.dev_tag}}-${{github.sha}} -server-image=${{matrix.server.image}}
         continue-on-error: true
       - uses: actions/upload-artifact@v3
         continue-on-error: true

.github/workflows/changelog-checker.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0 # by default the checkout action doesn't checkout all branches

.github/workflows/consul-dataplane-checks.yaml

@@ -4,58 +4,25 @@ on:
   push:
     branches:
     - main
-    - 'release/*.*.x'
   pull_request:
 
 jobs:
-  get-go-version:
-    name: "Determine Go toolchain version"
-    runs-on: ubuntu-latest
-    outputs:
-      go-version: ${{ steps.get-go-version.outputs.go-version }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Determine Go version
-        id: get-go-version
-        # We use .go-version as our source of truth for current Go
-        # version, because "goenv" can react to it automatically.
-        run: |
-          echo "Building with Go $(cat .go-version)"
-          echo "go-version=$(cat .go-version)" >> $GITHUB_OUTPUT
   unit-tests:
     name: unit-tests
-    needs:
-      - get-go-version
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: ${{ needs.get-go-version.outputs.go-version }}
+          go-version: '1.20'
       - run: go test ./...
-  integration-tests:
-    name: integration-tests
-    needs:
-      - get-go-version
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
-        with:
-          go-version: ${{ needs.get-go-version.outputs.go-version }}
-      - run: make docker
-      #  Currently the server version below is set to 1.15-dev: integration-tests/main_test.go
-      - run: echo "VERSION=$(make version)" >> $GITHUB_ENV
-      - run: cd integration-tests && go test -dataplane-image="consul-dataplane/release-default:${{ env.VERSION }}"
   golangci:
     name: lint
-    needs:
-      - get-go-version
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: ${{ needs.get-go-version.outputs.go-version }}
+          go-version: '1.20'
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3