Enable TLS-e by default

As there is no longer an external dependency, TLS-e can now be enabled by default (with explicit opt-out e.g for adoption). Depends-On: openstack-k8s-operators/dataplane-operator#754 Related: OSPRH-2038
olliewalsh · Apr 3, 2024 · 89f5417 · 89f5417
1 parent d31f580
commit 89f5417
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -17117,7 +17117,7 @@ spec:
                       duration: 8760h
                     enabled: true
                   podLevel:
-                    enabled: false
+                    enabled: true
                     internal:
                       ca:
                         duration: 43800h

diff --git a/apis/core/v1beta1/openstackcontrolplane_types.go b/apis/core/v1beta1/openstackcontrolplane_types.go
@@ -78,7 +78,7 @@ type OpenStackControlPlaneSpec struct {
 
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	// +kubebuilder:default={ingress: {enabled: true, ca: {duration: "43800h"}, cert: {duration: "8760h"}}, podLevel: {enabled: false, internal:{ca: {duration: "43800h"}, cert: {duration: "8760h"}}, ovn: {ca: {duration: "43800h"}, cert: {duration: "8760h"}}}}
+	// +kubebuilder:default={ingress: {enabled: true, ca: {duration: "43800h"}, cert: {duration: "8760h"}}, podLevel: {enabled: true, internal:{ca: {duration: "43800h"}, cert: {duration: "8760h"}}, ovn: {ca: {duration: "43800h"}, cert: {duration: "8760h"}}}}
 	// TLS - Parameters related to the TLS
 	TLS TLSSection `json:"tls"`
 

diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -17117,7 +17117,7 @@ spec:
                       duration: 8760h
                     enabled: true
                   podLevel:
-                    enabled: false
+                    enabled: true
                     internal:
                       ca:
                         duration: 43800h

diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/openshift/api v3.9.0+incompatible
 	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240401125932-8d6162aed60d
 	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531
-	github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240401125648-018312133e03
+	github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240403060401-60ae6dbc17ee
 	github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240306213520-073a542389ea
 	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240402071437-c504b07a56dc
 	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240402094019-17495fd5d880

diff --git a/go.sum b/go.sum
@@ -100,8 +100,8 @@ github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240401125932-8
 github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240401125932-8d6162aed60d/go.mod h1:d4lFj3oT9ZReHGT/ngbF8ViVnv3vnHs/nemKVubkBGA=
 github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531 h1:91Mwjt0eGtisBOiiB8fbu1i6Ow1bzd55/f1y89z1BcU=
 github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531/go.mod h1:ayvrE0oMzyA/AQDKpCqNT9uupRT0TqrSFXb1sjmvWqE=
-github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240401125648-018312133e03 h1:lJ2DTJfEG8oqFLdRTp3bVgKR6Y2TSUlnrSOiWkF/YrU=
-github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240401125648-018312133e03/go.mod h1:Or21GRh+xv0VQ9yL1K5CfQ0UVQhtDCfvqaBeY3DLNB4=
+github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240403060401-60ae6dbc17ee h1:PIP0mKOzoNx73uFkjPWCFGGXdrdejEYwb9f2DPPc21E=
+github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240403060401-60ae6dbc17ee/go.mod h1:Or21GRh+xv0VQ9yL1K5CfQ0UVQhtDCfvqaBeY3DLNB4=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240306213520-073a542389ea h1:6E5uL2bqgsOxKuV0K58w5L98PoNVg+iExgTzsfZfP8s=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240306213520-073a542389ea/go.mod h1:6ogMzx/FQFtClz+tI+pdeb+8b3YtmQtxDGApBmMphVI=
 github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240402071437-c504b07a56dc h1:6msMu82b6HQENmS+RhFpo+AtyRn6QKbF6ko9q4YsqmA=

diff --git a/tests/kuttl/common/assert-sample-deployment.yaml b/tests/kuttl/common/assert-sample-deployment.yaml
@@ -179,7 +179,7 @@ spec:
         duration: 8760h0m0s
       enabled: true
     podLevel:
-      enabled: false
+      enabled: true
       internal:
         ca:
           duration: 43800h0m0s

diff --git a/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml b/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml
@@ -132,7 +132,7 @@ spec:
         duration: 8760h0m0s
       enabled: true
     podLevel:
-      enabled: false
+      enabled: true
       internal:
         ca:
           duration: 43800h0m0s

diff --git a/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml b/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml
@@ -135,7 +135,7 @@ spec:
         duration: 8760h0m0s
       enabled: true
     podLevel:
-      enabled: false
+      enabled: true
       internal:
         ca:
           duration: 43800h0m0s

diff --git a/tests/kuttl/tests/galera-basic/01-assert-galera.yaml b/tests/kuttl/tests/galera-basic/01-assert-galera.yaml
@@ -154,7 +154,7 @@ spec:
         duration: 8760h0m0s
       enabled: true
     podLevel:
-      enabled: false
+      enabled: true
       internal:
         ca:
           duration: 43800h0m0s