Merge pull request #290 from 3scale-ops/feat/envoy-TLSv1_3

Feat/Add tls_maximum_protocol_version TLSv1.3 to EnvoyConfig
3scale-ops · Jan 23, 2024 · 73e0143 · 73e0143
2 parents 7e2a9ef + 19daf6e
commit 73e0143
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.21.0
+VERSION ?= 0.22.0-alpha.3
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
 # To re-generate a bundle for other specific channels without changing the standard setup, you can:

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -5,8 +5,7 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=saas-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=alpha,stable
-LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
+LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.27.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

diff --git a/bundle/manifests/saas-operator.clusterserviceversion.yaml b/bundle/manifests/saas-operator.clusterserviceversion.yaml
@@ -598,15 +598,15 @@ metadata:
     capabilities: Basic Install
     categories: Integration & Delivery
     containerImage: quay.io/3scale/saas-operator
-    createdAt: "2024-01-10T15:23:22Z"
+    createdAt: "2024-01-22T16:11:08Z"
     description: |-
       The 3scale SaaS Operator creates and maintains a SaaS-ready deployment
       of the Red Hat 3scale API Management on OpenShift.
     operators.operatorframework.io/builder: operator-sdk-v1.27.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/3scale-ops/saas-operator
     support: Red Hat
-  name: saas-operator.v0.21.0
+  name: saas-operator.v0.22.0-alpha.3
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -4468,7 +4468,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/3scale/saas-operator:v0.21.0
+                image: quay.io/3scale/saas-operator:v0.22.0-alpha.3
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -5032,4 +5032,4 @@ spec:
   provider:
     name: Red Hat
     url: https://www.3scale.net/
-  version: 0.21.0
+  version: 0.22.0-alpha.3
diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -4,8 +4,7 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: saas-operator
-  operators.operatorframework.io.bundle.channels.v1: alpha,stable
-  operators.operatorframework.io.bundle.channel.default.v1: alpha
+  operators.operatorframework.io.bundle.channels.v1: alpha
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.27.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/3scale/saas-operator
-  newTag: v0.21.0
+  newTag: v0.22.0-alpha.3
diff --git a/pkg/resource_builders/envoyconfig/resource_test.go b/pkg/resource_builders/envoyconfig/resource_test.go
@@ -163,6 +163,7 @@ func TestNew(t *testing.T) {
                                           ads: {}
                                           resource_api_version: V3
                                       tls_params:
+                                        tls_maximum_protocol_version: TLSv1_3
                                         tls_minimum_protocol_version: TLSv1_2
                               listener_filters:
                               - name: envoy.filters.listener.tls_inspector

diff --git a/pkg/resource_builders/envoyconfig/templates/listeners.go b/pkg/resource_builders/envoyconfig/templates/listeners.go
@@ -268,6 +268,7 @@ func TransportSocket_v1(secretName string, http2 bool) *envoy_config_core_v3.Tra
 						},
 						TlsParams: &envoy_extensions_transport_sockets_tls_v3.TlsParameters{
 							TlsMinimumProtocolVersion: envoy_extensions_transport_sockets_tls_v3.TlsParameters_TLSv1_2,
+							TlsMaximumProtocolVersion: envoy_extensions_transport_sockets_tls_v3.TlsParameters_TLSv1_3,
 						},
 						AlpnProtocols: func() []string {
 							if http2 {

diff --git a/pkg/resource_builders/envoyconfig/templates/listeners_test.go b/pkg/resource_builders/envoyconfig/templates/listeners_test.go
@@ -124,6 +124,7 @@ func TestListenerHTTP_v1(t *testing.T) {
                             ads: {}
                             resource_api_version: V3
                         tls_params:
+                          tls_maximum_protocol_version: TLSv1_3
                           tls_minimum_protocol_version: TLSv1_2
                 listener_filters:
                 - name: envoy.filters.listener.tls_inspector

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -1,7 +1,7 @@
 package version
 
 const (
-	version string = "v0.21.0"
+	version string = "v0.22.0-alpha.3"
 )
 
 // Current returns the current marin3r operator version