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
openstack-k8s-operators · Apr 8, 2024 · b9c70d6 · b9c70d6
1 parent 9d41cf0
commit b9c70d6
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -17336,7 +17336,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
@@ -17336,7 +17336,7 @@ spec:
                       duration: 8760h
                     enabled: true
                   podLevel:
-                    enabled: false
+                    enabled: true
                     internal:
                       ca:
                         duration: 43800h

diff --git a/go.mod b/go.mod
@@ -125,3 +125,5 @@ replace github.com/openstack-k8s-operators/openstack-operator/apis => ./apis
 // mschuppert: map to latest commit from release-4.13 tag
 // must consistent within modules and service operators
 replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging
+
+replace github.com/openstack-k8s-operators/dataplane-operator/api => github.com/olliewalsh/dataplane-operator/api v0.0.0-20240408152119-8366d8d0e329
diff --git a/go.sum b/go.sum
@@ -90,6 +90,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/olliewalsh/dataplane-operator/api v0.0.0-20240408152119-8366d8d0e329 h1:DyMnidmAFbQChPt4JM1ljV8lWuWE57WxSKKarbcB+to=
+github.com/olliewalsh/dataplane-operator/api v0.0.0-20240408152119-8366d8d0e329/go.mod h1:qdQIGOEMwCl89Os/D9ovPiBekl3/THvuBetP+YKzP+A=
 github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8=
 github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
 github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk=
@@ -100,8 +102,6 @@ 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/designate-operator/api v0.0.0-20240403153039-29d27af23767 h1:He5McazPpzOM00VkSpwK85oUq5JMHdjT8o26HxwQamc=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767/go.mod h1:SHv9v0wscyVv0yT3VD2UuPvw+kwRAEX/x/8fbnfZVpo=
 github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240403091918-407c91f5e7aa h1:dH/2k//Y/U9SXiiaiqUVZveg08KkWWxg71bs2azhWrQ=

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