Add support for ingress gateway CRD

.circleci/config.yml

@@ -152,7 +152,8 @@ jobs:
                     -kubeconfig="$primary_kubeconfig" \
                     -secondary-kubeconfig="$secondary_kubeconfig" \
                     -debug-directory="$TEST_RESULTS/debug" \
-                    -consul-k8s-image=docker.mirror.hashicorp.services/hashicorpdev/consul-k8s:latest
+                    -consul-k8s-image=ghcr.io/lkysow/consul-k8s-dev:nov26 \
+                    -run TestController
               then
                 echo "Tests in ${pkg} failed, aborting early"
                 exit_code=1

CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Unreleased
 
+FEATURES:
+* CRDs: add new CRD `IngressGateway` for configuring Consul's [ingress-gateway](https://www.consul.io/docs/agent/config-entries/ingress-gateway) config entry. [[GH-714](https://github.com/hashicorp/consul-helm/pull/714)]
+
+BUG FIXES:
+* CRDs: **(Consul Enterprise only)** change `ServiceResolver` field `failover[].namespaces` to `failover[].namespace`.
+  This will not affect existing `ServiceResolver` resources and will only update the documentation for that field.
+
+  If `failover[].namespaces` was used previously, it was ignored and after this change it will still be ignored.
+  If `failover[].namespace` was used previously, it worked correctly and after this change it will still work correctly. [[GH-714](https://github.com/hashicorp/consul-helm/pull/714)]
+
 ## 0.27.0 (Nov 25, 2020)
 
 IMPROVEMENTS:

templates/controller-clusterrole.yaml

@@ -19,6 +19,7 @@ rules:
   - servicerouters
   - servicesplitters
   - serviceintentions
+  - ingressgateways
   verbs:
   - create
   - delete
@@ -36,6 +37,7 @@ rules:
   - servicerouters/status
   - servicesplitters/status
   - serviceintentions/status
+  - ingressgateways/status
   verbs:
   - get
   - patch

templates/controller-mutatingwebhookconfiguration.yaml

@@ -146,4 +146,26 @@ webhooks:
       resources:
       - serviceintentions
   sideEffects: None
+- clientConfig:
+    caBundle: Cg==
+    service:
+      name: {{ template "consul.fullname" . }}-controller-webhook
+      namespace: {{ .Release.Namespace }}
+      path: /mutate-v1alpha1-ingressgateway
+  failurePolicy: Fail
+  admissionReviewVersions:
+    - "v1beta1"
+    - "v1"
+  name: mutate-ingressgateway.consul.hashicorp.com
+  rules:
+    - apiGroups:
+        - consul.hashicorp.com
+      apiVersions:
+        - v1alpha1
+      operations:
+        - CREATE
+        - UPDATE
+      resources:
+        - ingressgateways
+  sideEffects: None
 {{- end }}

templates/crd-ingressgateways.yaml

@@ -0,0 +1,132 @@
+{{- if .Values.controller.enabled }}
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.4.1
+  creationTimestamp: null
+  name: ingressgateways.consul.hashicorp.com
+  labels:
+    app: {{ template "consul.name" . }}
+    chart: {{ template "consul.chart" . }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+    component: crd
+spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.conditions[?(@.type=="Synced")].status
+    description: The sync status of the resource with Consul
+    name: Synced
+    type: string
+  - JSONPath: .metadata.creationTimestamp
+    description: The age of the resource
+    name: Age
+    type: date
+  group: consul.hashicorp.com
+  names:
+    kind: IngressGateway
+    listKind: IngressGatewayList
+    plural: ingressgateways
+    singular: ingressgateway
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: IngressGateway is the Schema for the ingressgateways API
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: IngressGatewaySpec defines the desired state of IngressGateway
+          properties:
+            listeners:
+              description: Listeners declares what ports the ingress gateway should listen on, and what services to associated to those ports.
+              items:
+                description: IngressListener manages the configuration for a listener on a specific port.
+                properties:
+                  port:
+                    description: Port declares the port on which the ingress gateway should listen for traffic.
+                    type: integer
+                  protocol:
+                    description: 'Protocol declares what type of traffic this listener is expected to receive. Depending on the protocol, a listener might support multiplexing services over a single port, or additional discovery chain features. The current supported values are: (tcp | http | http2 | grpc).'
+                    type: string
+                  services:
+                    description: "Services declares the set of services to which the listener forwards traffic. \n For \"tcp\" protocol listeners, only a single service is allowed. For \"http\" listeners, multiple services can be declared."
+                    items:
+                      description: IngressService manages configuration for services that are exposed to ingress traffic.
+                      properties:
+                        hosts:
+                          description: "Hosts is a list of hostnames which should be associated to this service on the defined listener. Only allowed on layer 7 protocols, this will be used to route traffic to the service by matching the Host header of the HTTP request. \n If a host is provided for a service that also has a wildcard specifier defined, the host will override the wildcard-specifier-provided \"<service-name>.*\" domain for that listener. \n This cannot be specified when using the wildcard specifier, \"*\", or when using a \"tcp\" listener."
+                          items:
+                            type: string
+                          type: array
+                        name:
+                          description: "Name declares the service to which traffic should be forwarded. \n This can either be a specific service, or the wildcard specifier, \"*\". If the wildcard specifier is provided, the listener must be of \"http\" protocol and means that the listener will forward traffic to all services. \n A name can be specified on multiple listeners, and will be exposed on both of the listeners."
+                          type: string
+                        namespace:
+                          description: Namespace is the namespace where the service is located. Namespacing is a Consul Enterprise feature.
+                          type: string
+                      type: object
+                    type: array
+                type: object
+              type: array
+            tls:
+              description: TLS holds the TLS configuration for this gateway.
+              properties:
+                enabled:
+                  description: Indicates that TLS should be enabled for this gateway service.
+                  type: boolean
+              required:
+              - enabled
+              type: object
+          type: object
+        status:
+          properties:
+            conditions:
+              description: Conditions indicate the latest available observations of a resource's current state.
+              items:
+                description: 'Conditions define a readiness condition for a Consul resource. See: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties'
+                properties:
+                  lastTransitionTime:
+                    description: LastTransitionTime is the last time the condition transitioned from one status to another.
+                    format: date-time
+                    type: string
+                  message:
+                    description: A human readable message indicating details about the transition.
+                    type: string
+                  reason:
+                    description: The reason for the condition's last transition.
+                    type: string
+                  status:
+                    description: Status of the condition, one of True, False, Unknown.
+                    type: string
+                  type:
+                    description: Type of condition.
+                    type: string
+                required:
+                - status
+                - type
+                type: object
+              type: array
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
+{{- end }}

templates/crd-proxydefaults.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: proxydefaults.consul.hashicorp.com
   labels:

templates/crd-servicedefaults.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: servicedefaults.consul.hashicorp.com
   labels:

templates/crd-serviceintentions.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: serviceintentions.consul.hashicorp.com
   labels:

templates/crd-serviceresolvers.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: serviceresolvers.consul.hashicorp.com
   labels:
@@ -62,7 +62,7 @@ spec:
                     items:
                       type: string
                     type: array
-                  namespaces:
+                  namespace:
                     description: Namespace is the namespace to resolve the requested service from to form the failover group of instances. If empty the current namespace is used.
                     type: string
                   service:
@@ -75,83 +75,60 @@ spec:
               description: Failover controls when and how to reroute traffic to an alternate pool of service instances. The map is keyed by the service subset it applies to and the special string "*" is a wildcard that applies to any subset not otherwise specified here.
               type: object
             loadBalancer:
-              description: LoadBalancer determines the load balancing policy and configuration
-                for services issuing requests to this upstream service.
+              description: LoadBalancer determines the load balancing policy and configuration for services issuing requests to this upstream service.
               properties:
                 hashPolicies:
-                  description: HashPolicies is a list of hash policies to use for
-                    hashing load balancing algorithms. Hash policies are evaluated
-                    individually and combined such that identical lists result in
-                    the same hash. If no hash policies are present, or none are successfully
-                    evaluated, then a random backend host will be selected.
+                  description: HashPolicies is a list of hash policies to use for hashing load balancing algorithms. Hash policies are evaluated individually and combined such that identical lists result in the same hash. If no hash policies are present, or none are successfully evaluated, then a random backend host will be selected.
                   items:
                     properties:
                       cookieConfig:
-                        description: CookieConfig contains configuration for the "cookie"
-                          hash policy type.
+                        description: CookieConfig contains configuration for the "cookie" hash policy type.
                         properties:
                           path:
                             description: Path is the path to set for the cookie.
                             type: string
                           session:
-                            description: Session generates a session cookie with no
-                              expiration.
+                            description: Session determines whether to generate a session cookie with no expiration.
                             type: boolean
                           ttl:
-                            description: TTL is the ttl for generated cookies. Cannot
-                              be specified for session cookies.
+                            description: TTL is the ttl for generated cookies. Cannot be specified for session cookies.
                             format: int64
                             type: integer
                         type: object
                       field:
-                        description: Field is the attribute type to hash on. Must
-                          be one of "header", "cookie", or "query_parameter". Cannot
-                          be specified along with sourceIP.
+                        description: Field is the attribute type to hash on. Must be one of "header", "cookie", or "query_parameter". Cannot be specified along with sourceIP.
                         type: string
                       fieldValue:
-                        description: FieldValue is the value to hash. ie. header name,
-                          cookie name, URL query parameter name Cannot be specified
-                          along with sourceIP.
+                        description: FieldValue is the value to hash. ie. header name, cookie name, URL query parameter name Cannot be specified along with sourceIP.
                         type: string
                       sourceIP:
-                        description: SourceIP determines whether the hash should be
-                          of the source IP rather than of a field and field value.
-                          Cannot be specified along with field or fieldValue.
+                        description: SourceIP determines whether the hash should be of the source IP rather than of a field and field value. Cannot be specified along with field or fieldValue.
                         type: boolean
                       terminal:
-                        description: Terminal will short circuit the computation of
-                          the hash when multiple hash policies are present. If a hash
-                          is computed when a Terminal policy is evaluated, then that
-                          hash will be used and subsequent hash policies will be ignored.
+                        description: Terminal will short circuit the computation of the hash when multiple hash policies are present. If a hash is computed when a Terminal policy is evaluated, then that hash will be used and subsequent hash policies will be ignored.
                         type: boolean
                     type: object
                   type: array
                 leastRequestConfig:
-                  description: LeastRequestConfig contains configuration for the "leastRequest"
-                    policy type.
+                  description: LeastRequestConfig contains configuration for the "leastRequest" policy type.
                   properties:
                     choiceCount:
-                      description: ChoiceCount determines the number of random healthy
-                        hosts from which to select the one with the least requests.
+                      description: ChoiceCount determines the number of random healthy hosts from which to select the one with the least requests.
                       format: int32
                       type: integer
                   type: object
                 policy:
-                  description: Policy is the load balancing policy used to select
-                    a host.
+                  description: Policy is the load balancing policy used to select a host.
                   type: string
                 ringHashConfig:
-                  description: RingHashConfig contains configuration for the "ringHash"
-                    policy type.
+                  description: RingHashConfig contains configuration for the "ringHash" policy type.
                   properties:
                     maximumRingSize:
-                      description: MaximumRingSize determines the maximum number of
-                        entries in the hash ring.
+                      description: MaximumRingSize determines the maximum number of entries in the hash ring.
                       format: int64
                       type: integer
                     minimumRingSize:
-                      description: MinimumRingSize determines the minimum number of
-                        entries in the hash ring.
+                      description: MinimumRingSize determines the minimum number of entries in the hash ring.
                       format: int64
                       type: integer
                   type: object

templates/crd-servicerouters.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: servicerouters.consul.hashicorp.com
   labels:

templates/crd-servicesplitters.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: servicesplitters.consul.hashicorp.com
   labels: