hashicorp · andrewstucki · Feb 28, 2023 · Nov 18, 2022 · Nov 21, 2022 · Nov 21, 2022
diff --git a/.changelog/470.txt b/.changelog/470.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+Add initial set of copyright headers to applicable files
+```
diff --git a/.changelog/474.txt b/.changelog/474.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+go: build with Go v1.19.4
+```
diff --git a/.changelog/483.txt b/.changelog/483.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+consul: fix Consul Enterprise gateway sync issue with Kubernetes namespace mirroring disabled and the Consul destination namespace set to "default"
+```
diff --git a/.changelog/505.txt b/.changelog/505.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+Fix `cross-namespace-policy` not being applied to namespaces created by the controller.
+```
diff --git a/.changelog/521.txt b/.changelog/521.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+Bump the default envoy image for consul 1.15 compatability when the image is not specified in a GatewayClassConfig
+```
diff --git a/.copywrite.hcl b/.copywrite.hcl
@@ -0,0 +1,16 @@
+schema_version = 1
+
+project {
+  license        = "MPL-2.0"
+  copyright_year = 2021
+
+  # (OPTIONAL) A list of globs that should not have copyright or license headers .
+  # Supports doublestar glob patterns for more flexibility in defining which
+  # files or folders should be ignored
+  # Default: []
+  header_ignore = [
+    "config/rbac/role.yaml",
+    "config/crd/bases/*.yaml",
+    "**/testdata/**.golden.yaml"
+  ]
+}
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 blank_issues_enabled: false
 contact_links:
   - name: Consul Discuss Forum

diff --git a/.github/actions/goenv/action.yml b/.github/actions/goenv/action.yml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 name: "Setup Go Environment"
 description: "Setup a go environment with caching"
 inputs:

diff --git a/.github/actions/setup-eks/action.yml b/.github/actions/setup-eks/action.yml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 name: "Setup EKS"
 description: "Installs eksctl, configures AWS credentials in the workflow's environment and sets up an EKS cluster."
 inputs:

diff --git a/.github/actions/setup-eks/cluster.tf b/.github/actions/setup-eks/cluster.tf
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 variable "cluster_name" {
   type = string
   nullable = false

diff --git a/.github/actions/setup-kind/action.yml b/.github/actions/setup-kind/action.yml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 name: "Setup Kind"
 description: "Setup a Kind cluster with MetalLB for ingress"
 inputs:

diff --git a/.github/actions/teardown-eks/action.yml b/.github/actions/teardown-eks/action.yml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 name: "Tear down EKS"
 description: "Tears down an EKS cluster. Requires eksctl and credentials in the workflow's environment from the setup-eks action."
 inputs:

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 version: 2
 updates:
   - package-ecosystem: gomod

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -68,7 +68,7 @@ jobs:
       matrix:
         goos: ["linux"]
         goarch: ["arm", "arm64", "386", "amd64"]
-        go: ["1.19.2"]
+        go: ["1.19.4"]
       fail-fast: true
 
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -118,13 +118,15 @@ jobs:
         tar xvzf kustomize_v4.4.0_linux_amd64.tar.gz
         mv kustomize /usr/local/bin/kustomize
         rm kustomize_v4.4.0_linux_amd64.tar.gz
+        docker version
     - uses: ./.github/actions/goenv
       with:
         go-version: ${{ env.GO_VERSION }}
 
     - name: Test
       env:
         DOCKER_HOST_ROUTE: 172.17.0.1
+        DOCKER_API_VERSION: 1.41
         E2E_APIGW_CONSUL_IMAGE: ${{ matrix.consul-image }}
       run: |
         mkdir -p $TEST_RESULTS_DIR/json

diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
@@ -34,21 +34,25 @@ jobs:
             consul-image: "hashicorp/consul:1.12"
             envoy-image: "envoyproxy/envoy:v1.22-latest"
             consul-k8s-version: "v0.49.1"
+            envoy-field: "global.imageEnvoy"
           - name: "consul@v1.13 + consul-k8s@v0.49.1"
             api-gateway-image: "hashicorppreview/consul-api-gateway:0.5-dev"
             consul-image: "hashicorp/consul:1.13"
             envoy-image: "envoyproxy/envoy:v1.22-latest"
             consul-k8s-version: "v0.49.1"
-          - name: "consul@v1.14-dev + consul-k8s@v1.0.0"
+            envoy-field: "global.imageEnvoy"
+          - name: "consul@v1.14 + consul-k8s@v1.0.1"
             api-gateway-image: "hashicorppreview/consul-api-gateway:0.5-dev"
             consul-image: "hashicorp/consul:1.14"
-            envoy-image: "envoyproxy/envoy:v1.22-latest"
-            consul-k8s-version: "main"
-          - name: "consul@v1.15-dev + consul-k8s@v1.0.0"
+            envoy-image: "envoyproxy/envoy:v1.24-latest"
+            consul-k8s-version: "v1.0.1"
+            envoy-field: "apiGateway.imageEnvoy"
+          - name: "consul@v1.15-dev + consul-k8s@v1.0.1"
             api-gateway-image: "hashicorppreview/consul-api-gateway:0.5-dev"
             consul-image: "hashicorppreview/consul:1.15-dev"
-            envoy-image: "envoyproxy/envoy:v1.22-latest"
-            consul-k8s-version: "main"
+            envoy-image: "envoyproxy/envoy:v1.24-latest"
+            consul-k8s-version: "v1.0.1"
+            envoy-field: "apiGateway.imageEnvoy"
       fail-fast: false
     name: "${{ matrix.cluster-type }} - ${{ matrix.config.name }}"
     concurrency:
@@ -106,7 +110,7 @@ jobs:
       - name: Install Consul
         working-directory: "consul-api-gateway/internal/testing/conformance"
         run: |
-          helm install --values ./consul-config.yaml consul $GITHUB_WORKSPACE/consul-k8s/charts/consul --set global.image=${{ matrix.config.consul-image }} --set global.imageEnvoy=${{ matrix.config.envoy-image }} --set apiGateway.image=${{ matrix.config.api-gateway-image }} --create-namespace --namespace=consul
+          helm install --values ./consul-config.yaml consul $GITHUB_WORKSPACE/consul-k8s/charts/consul --set global.image=${{ matrix.config.consul-image }} --set ${{ matrix.config.envoy-field }}=${{ matrix.config.envoy-image }} --set apiGateway.image=${{ matrix.config.api-gateway-image }} --create-namespace --namespace=consul
           kubectl wait --for=condition=Ready --timeout=120s --namespace=consul pods --all
 
       - name: Patch testing resources

diff --git a/.github/workflows/conformance_with_build.yml b/.github/workflows/conformance_with_build.yml
@@ -36,21 +36,25 @@ jobs:
             consul-image: "hashicorp/consul:1.12"
             envoy-image: "envoyproxy/envoy:v1.22-latest"
             consul-k8s-version: "v0.49.1"
+            envoy-field: "global.imageEnvoy"
           - name: "consul@v1.13 + consul-k8s@v0.49.1"
             api-gateway-image: "consul-api-gateway:local-build"
             consul-image: "hashicorp/consul:1.13"
             envoy-image: "envoyproxy/envoy:v1.22-latest"
             consul-k8s-version: "v0.49.1"
-          - name: "consul@v1.14 + consul-k8s@v1.0.0"
+            envoy-field: "global.imageEnvoy"
+          - name: "consul@v1.14 + consul-k8s@v1.0.1"
             api-gateway-image: "consul-api-gateway:local-build"
             consul-image: "hashicorp/consul:1.14"
-            envoy-image: "envoyproxy/envoy:v1.22-latest"
-            consul-k8s-version: "main"
-          - name: "consul@v1.15-dev + consul-k8s@v1.0.0"
+            envoy-image: "envoyproxy/envoy:v1.24-latest"
+            consul-k8s-version: "v1.0.1"
+            envoy-field: "apiGateway.imageEnvoy"
+          - name: "consul@v1.15-dev + consul-k8s@v1.0.1"
             api-gateway-image: "consul-api-gateway:local-build"
             consul-image: "hashicorppreview/consul:1.15-dev"
-            envoy-image: "envoyproxy/envoy:v1.22-latest"
-            consul-k8s-version: "main"
+            envoy-image: "envoyproxy/envoy:v1.24-latest"
+            consul-k8s-version: "v1.0.1"
+            envoy-field: "apiGateway.imageEnvoy"
       fail-fast: false
     name: "${{ matrix.config.name }}"
 
@@ -119,7 +123,7 @@ jobs:
       - name: Install Consul
         working-directory: "consul-api-gateway/internal/testing/conformance"
         run: |
-          helm install --values ./consul-config.yaml consul $GITHUB_WORKSPACE/consul-k8s/charts/consul --set global.image=${{ matrix.config.consul-image }} --set global.imageEnvoy=${{ matrix.config.envoy-image }} --set apiGateway.image=${{ matrix.config.api-gateway-image }} --create-namespace --namespace=consul
+          helm install --values ./consul-config.yaml consul $GITHUB_WORKSPACE/consul-k8s/charts/consul --set global.image=${{ matrix.config.consul-image }} --set ${{ matrix.config.envoy-field }}=${{ matrix.config.envoy-image }} --set apiGateway.image=${{ matrix.config.api-gateway-image }} --create-namespace --namespace=consul
           kubectl wait --for=condition=Ready --timeout=60s --namespace=consul pods --all
 
       - name: Patch testing resources

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 linters:
   disable-all: true
   enable:

diff --git a/.release/ci.hcl b/.release/ci.hcl
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 schema = "1"
 
 project "consul-api-gateway" {

diff --git a/.release/release-metadata.hcl b/.release/release-metadata.hcl
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 url_docker_registry_dockerhub = "https://hub.docker.com/r/hashicorp/consul-api-gateway"
 url_license                   = "https://github.com/hashicorp/consul-api-gateway/blob/main/LICENSE"
 url_project_website           = "https://developer.hashicorp.com/consul/docs/api-gateway"

diff --git a/.release/security-scan.hcl b/.release/security-scan.hcl
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 container {
 	dependencies = true
 	alpine_secdb = true

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,7 @@
-FROM golang:1.19.1-alpine as go-discover
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+FROM golang:1.19.4-alpine as go-discover
 RUN CGO_ENABLED=0 go install github.com/hashicorp/go-discover/cmd/discover@49f60c093101c9c5f6b04d5b1c80164251a761a6
 
 # ===================================
@@ -7,10 +10,16 @@ RUN CGO_ENABLED=0 go install github.com/hashicorp/go-discover/cmd/discover@49f60
 #
 # ===================================
 
+# devdeps installs deps so we don't need to do it each time
+FROM golang:latest as devdeps
+ARG BIN_NAME
+WORKDIR /build
+COPY go.mod go.sum ./
+RUN go mod download
 
 # devbuild compiles the binary
 # -----------------------------------
-FROM golang:latest AS devbuild
+FROM devdeps AS devbuild
 ARG BIN_NAME
 # Escape the GOPATH
 WORKDIR /build

diff --git a/Dockerfile.local b/Dockerfile.local
@@ -1,4 +1,4 @@
-FROM golang:1.19.1-alpine as go-discover
+FROM golang:1.19.4-alpine as go-discover
 RUN CGO_ENABLED=0 go install github.com/hashicorp/go-discover/cmd/discover@49f60c093101c9c5f6b04d5b1c80164251a761a6
 
 FROM alpine:latest

diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ GOIMPORTS=$(shell which goimports)
 
 .PHONY: fmt
 fmt: goimports
-	@for d in $$(go list -f {{.Dir}} ./...); do ${GOIMPORTS} --local github.com/hashicorp --local github.com/hashicorp/consul-api-gateway -w -l $$d/*.go; done
+	@for d in $$(go list -f {{.Dir}} ./...); do ${GOIMPORTS} --local github.com/hashicorp/consul-api-gateway,github.com/hashicorp -w -l $$d/*.go; done
 
 .PHONY: lint
 lint:
@@ -50,13 +50,19 @@ endif
 test:
 	go test ./...
 
+# Run e2e tests, takes an optional variable `consul_image` which specifies the consul image to test against
+.PHONY: e2e
+e2e:
+	E2E_APIGW_CONSUL_IMAGE=$(consul_image) ./scripts/e2e_local.sh
+
+
 generate-golden-files:
 	GENERATE=true go test ./internal/adapters/consul
 	GENERATE=true go test ./internal/envoy
 	GENERATE=true go test ./internal/k8s/builder
 
 .PHONY: gen
-gen: generate-golden-files ctrl-generate ctrl-manifests
+gen: generate-golden-files ctrl-generate ctrl-manifests fmt
 ifeq (, $(shell which mockgen))
 	@go install github.com/golang/mock/mockgen
 endif

diff --git a/config/base/gateway-class-config.yaml b/config/base/gateway-class-config.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: api-gateway.consul.hashicorp.com/v1alpha1
 kind: GatewayClassConfig

diff --git a/config/base/gateway-class.yaml b/config/base/gateway-class.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: GatewayClass

diff --git a/config/crd/bases/api-gateway.consul.hashicorp.com_gatewayclassconfigs.yaml b/config/crd/bases/api-gateway.consul.hashicorp.com_gatewayclassconfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: gatewayclassconfigs.api-gateway.consul.hashicorp.com
 spec:

diff --git a/config/crd/bases/api-gateway.consul.hashicorp.com_meshservices.yaml b/config/crd/bases/api-gateway.consul.hashicorp.com_meshservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: meshservices.api-gateway.consul.hashicorp.com
 spec:

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 

diff --git a/config/deployment/clusterrolebinding.yaml b/config/deployment/clusterrolebinding.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

diff --git a/config/deployment/deployment.yaml b/config/deployment/deployment.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: apps/v1
 kind: Deployment

diff --git a/config/deployment/service.yaml b/config/deployment/service.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: v1
 kind: Service

diff --git a/config/deployment/serviceaccount.yaml b/config/deployment/serviceaccount.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: v1
 kind: ServiceAccount

diff --git a/config/example/certificates.yaml b/config/example/certificates.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: v1
 kind: Secret

diff --git a/config/example/external-dns.yaml b/config/example/external-dns.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: v1
 kind: ServiceAccount

diff --git a/config/example/gateway.yaml b/config/example/gateway.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: Gateway

diff --git a/config/example/kustomization.yaml b/config/example/kustomization.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 

diff --git a/config/example/route.yaml b/config/example/route.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: HTTPRoute

diff --git a/config/example/service.yaml b/config/example/service.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: consul.hashicorp.com/v1alpha1
 kind: ServiceDefaults

diff --git a/config/kustomization.yaml b/config/kustomization.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization