hashicorp · t-eckert · May 24, 2023 · Apr 14, 2023 · Apr 17, 2023 · Apr 17, 2023
diff --git a/...ul/templates/crd-gatewayclassconfigs.yaml → ...wayclassconfigs.consul.hashicorp.com.yaml b/...ul/templates/crd-gatewayclassconfigs.yaml → ...wayclassconfigs.consul.hashicorp.com.yaml
@@ -1,4 +1,6 @@
-{{- if .Values.connectInject.enabled }}
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -7,12 +9,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
   name: gatewayclassconfigs.consul.hashicorp.com
-  labels:
-    app: {{ template "consul.name" . }}
-    chart: {{ template "consul.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-    component: crd
 spec:
   group: consul.hashicorp.com
   names:
@@ -52,6 +48,33 @@ spec:
                       type: string
                     type: array
                 type: object
+              deployment:
+                description: Deployment defines the deployment configuration for the
+                  gateway.
+                properties:
+                  defaultInstances:
+                    default: 1
+                    description: Number of gateway instances that should be deployed
+                      by default
+                    format: int32
+                    maximum: 8
+                    minimum: 1
+                    type: integer
+                  maxInstances:
+                    default: 8
+                    description: Max allowed number of gateway instances
+                    format: int32
+                    maximum: 8
+                    minimum: 1
+                    type: integer
+                  minInstances:
+                    default: 1
+                    description: Minimum allowed number of gateway instances
+                    format: int32
+                    maximum: 8
+                    minimum: 1
+                    type: integer
+                type: object
               nodeSelector:
                 additionalProperties:
                   type: string
@@ -117,4 +140,3 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end }}
diff --git a/charts/consul/crds/gatewayclasses.gateway.networking.k8s.io.yaml b/charts/consul/crds/gatewayclasses.gateway.networking.k8s.io.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

diff --git a/charts/consul/crds/gateways.gateway.networking.k8s.io.yaml b/charts/consul/crds/gateways.gateway.networking.k8s.io.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

diff --git a/charts/consul/crds/grpcroutes.gateway.networking.k8s.io.yaml b/charts/consul/crds/grpcroutes.gateway.networking.k8s.io.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

diff --git a/charts/consul/crds/httproutes.gateway.networking.k8s.io.yaml b/charts/consul/crds/httproutes.gateway.networking.k8s.io.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

diff --git a/charts/consul/crds/kustomization.yaml b/charts/consul/crds/kustomization.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 # This file is Helm ignored. It it only used for the `make generate-external-crds` command.
 
 apiVersion: kustomize.config.k8s.io/v1beta1

diff --git a/charts/consul/crds/referencegrants.gateway.networking.k8s.io.yaml b/charts/consul/crds/referencegrants.gateway.networking.k8s.io.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

diff --git a/charts/consul/crds/tcproutes.gateway.networking.k8s.io.yaml b/charts/consul/crds/tcproutes.gateway.networking.k8s.io.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

diff --git a/charts/consul/crds/tlsroutes.gateway.networking.k8s.io.yaml b/charts/consul/crds/tlsroutes.gateway.networking.k8s.io.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

diff --git a/charts/consul/crds/udproutes.gateway.networking.k8s.io.yaml b/charts/consul/crds/udproutes.gateway.networking.k8s.io.yaml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

diff --git a/charts/consul/templates/gateway-gatewayclass.yaml b/charts/consul/templates/gateway-gatewayclass.yaml
@@ -0,0 +1,18 @@
+{{- if (and .Values.connectInject.enabled .Values.connectInject.apiGateway.managedGatewayClass.enabled) }}
+apiVersion: gateway.networking.k8s.io/v1beta1
+kind: GatewayClass
+metadata:
+  name: consul-api-gateway
+  labels:
+    app: {{ template "consul.name" . }}
+    chart: {{ template "consul.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    component: api-gateway-controller
+spec:
+  controllerName: consul.hashicorp.com/consul-api-gateway-controller
+  parametersRef:
+    group: consul.hashicorp.com
+    kind: GatewayClassConfig
+    name: consul-api-gateway
+{{- end }}
diff --git a/charts/consul/templates/gateway-gatewayclassconfig.yaml b/charts/consul/templates/gateway-gatewayclassconfig.yaml
@@ -0,0 +1,74 @@
+{{- if .Values.connectInject.enabled }}
+---
+apiVersion: consul.hashicorp.com/v1alpha1
+kind: GatewayClassConfig 
+metadata:
+  name: consul-api-gateway
+  labels:
+    app: {{ template "consul.name" . }}
+    chart: {{ template "consul.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    component: api-gateway
+spec:
+  {{- if .Values.apiGateway.enabled }} # Overide values from the old stanza. To be removed in 1.17 (t-eckert 2023-05-19)
+
+  {{- if .Values.apiGateway.managedGatewayClass.deployment }}
+  deployment:
+    {{- if .Values.apiGateway.managedGatewayClass.deployment.defaultInstances }}
+    defaultInstances: {{ .Values.apiGateway.managedGatewayClass.deployment.defaultInstances }}
+    {{- end}}
+    {{- if .Values.apiGateway.managedGatewayClass.deployment.maxInstances }}
+    maxInstances: {{ .Values.apiGateway.managedGatewayClass.deployment.maxInstances }}
+    {{- end}}
+    {{- if .Values.apiGateway.managedGatewayClass.deployment.minInstances }}
+    minInstances: {{ .Values.apiGateway.managedGatewayClass.deployment.minInstances }}
+    {{- end}}
+  {{- end}}
+  {{- if .Values.apiGateway.managedGatewayClass.nodeSelector }}
+  nodeSelector:
+    {{ tpl .Values.apiGateway.managedGatewayClass.nodeSelector . | indent 4 | trim }}
+  {{- end }}
+  {{- if .Values.apiGateway.managedGatewayClass.tolerations }}
+  tolerations:
+    {{ tpl .Values.apiGateway.managedGatewayClass.tolerations . | indent 4 | trim }}
+  {{- end }}
+  {{- if .Values.apiGateway.managedGatewayClass.copyAnnotations.service }}
+  copyAnnotations:
+    service: 
+      {{ tpl .Values.apiGateway.managedGatewayClass.copyAnnotations.service.annotations . | nindent 6 | trim }}
+  {{- end }}
+  serviceType: {{ .Values.apiGateway.managedGatewayClass.serviceType }}
+
+  {{- else }}
+
+  {{- if .Values.connectInject.apiGateway.managedGatewayClass.deployment }}
+  deployment:
+    {{- if .Values.connectInject.apiGateway.managedGatewayClass.deployment.defaultInstances }}
+    defaultInstances: {{ .Values.connectInject.apiGateway.managedGatewayClass.deployment.defaultInstances }}
+    {{- end}}
+    {{- if .Values.connectInject.apiGateway.managedGatewayClass.deployment.maxInstances }}
+    maxInstances: {{ .Values.connectInject.apiGateway.managedGatewayClass.deployment.maxInstances }}
+    {{- end}}
+    {{- if .Values.connectInject.apiGateway.managedGatewayClass.deployment.minInstances }}
+    minInstances: {{ .Values.connectInject.apiGateway.managedGatewayClass.deployment.minInstances }}
+    {{- end}}
+  {{- end}}
+  {{- if .Values.connectInject.apiGateway.managedGatewayClass.nodeSelector }}
+  nodeSelector:
+    {{ tpl .Values.connectInject.apiGateway.managedGatewayClass.nodeSelector . | indent 4 | trim }}
+  {{- end }}
+  {{- if .Values.connectInject.apiGateway.managedGatewayClass.tolerations }}
+  tolerations:
+    {{ tpl .Values.connectInject.apiGateway.managedGatewayClass.tolerations . | indent 4 | trim }}
+  {{- end }}
+  {{- if .Values.connectInject.apiGateway.managedGatewayClass.copyAnnotations.service }}
+  copyAnnotations:
+    service: 
+      {{ tpl .Values.connectInject.apiGateway.managedGatewayClass.copyAnnotations.service.annotations . | nindent 6 | trim }}
+  {{- end }}
+  serviceType: {{ .Values.connectInject.apiGateway.managedGatewayClass.serviceType }}
+
+  {{- end }}
+
+{{- end }}
diff --git a/charts/consul/test/unit/connect-inject-deployment.bats b/charts/consul/test/unit/connect-inject-deployment.bats
@@ -2436,3 +2436,4 @@ reservedNameTest() {
     jq -r '. | select( .name == "CONSUL_TLS_SERVER_NAME").value' | tee /dev/stderr)
   [ "${actual}" = "server.dc1.consul" ]
 }
+
diff --git a/charts/consul/test/unit/gateway-gatewayclass.bats b/charts/consul/test/unit/gateway-gatewayclass.bats
@@ -0,0 +1,29 @@
+#!/usr/bin/env bats
+
+load _helpers
+
+@test "apiGateway/GatewayClass: enabled by default" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      -s templates/gateway-gatewayclass.yaml  \
+      . | tee /dev/stderr |
+      yq 'length > 0' | tee /dev/stderr)
+  [ "${actual}" = "true" ]
+}
+
+@test "apiGateway/GatewayClass: disabled with connectInject.enabled" {
+  cd `chart_dir`
+  assert_empty helm template \
+      -s templates/gateway-gatewayclass.yaml  \
+      --set 'connectInject.enabled=false' \
+      .
+}
+
+@test "apiGateway/GatewayClass: disabled with connectInject.apiGateway.managedGatewayClass.enabled" {
+  cd `chart_dir`
+  assert_empty helm template \
+      -s templates/gateway-gatewayclass.yaml  \
+      --set 'connectInject.apiGateway.managedGatewayClass.enabled=false' \
+      .
+}
+
diff --git a/charts/consul/test/unit/gateway-gatewayclassconfig.bats b/charts/consul/test/unit/gateway-gatewayclassconfig.bats
@@ -0,0 +1,117 @@
+#!/usr/bin/env bats
+
+load _helpers
+
+@test "apiGateway/GatewayClassConfig: enabled by default" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      -s templates/gateway-gatewayclassconfig.yaml  \
+      . | tee /dev/stderr |
+      yq 'length > 0' | tee /dev/stderr)
+  [ "${actual}" = "true" ]
+}
+
+@test "apiGateway/GatewayClassConfig: disabled with connectInject.enabled" {
+  cd `chart_dir`
+  assert_empty helm template \
+      -s templates/gateway-gatewayclassconfig.yaml  \
+      --set 'connectInject.enabled=false' \
+      .
+}
+
+#--------------------------------------------------------------------
+# fallback configuration
+# to be removed in 1.17 (t-eckert 2023-05-23)
+
+@test "apiGateway/GatewayClassConfig: fallback configuration is used when apiGateway.enabled is true" {
+  cd `chart_dir`
+  local spec=$(helm template \
+      -s templates/gateway-gatewayclassconfig.yaml  \
+      --set 'apiGateway.enabled=true' \
+      --set 'apiGateway.image=testing' \
+      --set 'apiGateway.managedGatewayClass.nodeSelector=foo: bar' \
+      --set 'apiGateway.managedGatewayClass.tolerations=- key: bar' \
+      --set 'apiGateway.managedGatewayClass.copyAnnotations.service.annotations=- bingo' \
+      --set 'apiGateway.managedGatewayClass.serviceType=LoadBalancer' \
+      . | tee /dev/stderr |
+      yq '.spec' | tee /dev/stderr)
+
+  local actual=$(echo "$spec" |
+    jq -r '.nodeSelector.foo')
+  [ "${actual}" = "bar" ]
+
+  local actual=$(echo "$spec" |
+    jq -r '.tolerations[0].key')
+  [ "${actual}" = "bar" ]
+
+  local actual=$(echo "$spec" |
+    jq -r '.copyAnnotations.service[0]')
+  [ "${actual}" = "bingo" ]
+
+  local actual=$(echo "$spec" |
+    jq -r '.serviceType')
+  [ "${actual}" = "LoadBalancer" ]
+}
+
+#--------------------------------------------------------------------
+# configuration
+
+@test "apiGateway/GatewayClassConfig: default configuration" {
+  cd `chart_dir`
+  local spec=$(helm template \
+      -s templates/gateway-gatewayclassconfig.yaml  \
+      . | tee /dev/stderr |
+      yq '.spec' | tee /dev/stderr)
+
+  local actual=$(echo "$spec" |
+    jq -r '.deployment.defaultInstances')
+  [ "${actual}" = 1 ]
+
+  local actual=$(echo "$spec" |
+    jq -r '.deployment.maxInstances')
+  [ "${actual}" = 1 ]
+
+  local actual=$(echo "$spec" |
+    jq -r '.deployment.minInstances')
+  [ "${actual}" = 1 ]
+}
+
+@test "apigateway/gatewayclassconfig: custom configuration" {
+  cd `chart_dir`
+  local spec=$(helm template \
+      -s templates/gateway-gatewayclassconfig.yaml  \
+      --set 'connectInject.apiGateway.managedGatewayClass.nodeSelector=foo: bar' \
+      --set 'connectInject.apiGateway.managedGatewayClass.tolerations=- key: bar' \
+      --set 'connectInject.apiGateway.managedGatewayClass.copyAnnotations.service.annotations=- bingo' \
+      --set 'connectInject.apiGateway.managedGatewayClass.serviceType=LoadBalancer' \
+      . | tee /dev/stderr |
+      yq '.spec' | tee /dev/stderr)
+
+  local actual=$(echo "$spec" |
+    jq -r '.deployment.defaultInstances')
+  [ "${actual}" = "1" ]
+
+  local actual=$(echo "$spec" |
+    jq -r '.deployment.maxInstances')
+  [ "${actual}" = "1" ]
+
+  local actual=$(echo "$spec" |
+    jq -r '.deployment.minInstances')
+  [ "${actual}" = "1" ]
+
+  local actual=$(echo "$spec" |
+    jq -r '.nodeSelector.foo')
+  [ "${actual}" = "bar" ]
+
+  local actual=$(echo "$spec" |
+    jq -r '.tolerations[0].key')
+  [ "${actual}" = "bar" ]
+
+  local actual=$(echo "$spec" |
+    jq -r '.copyAnnotations.service[0]')
+  [ "${actual}" = "bingo" ]
+
+  local actual=$(echo "$spec" |
+    jq -r '.serviceType')
+  [ "${actual}" = "LoadBalancer" ]
+}