Revert "[tls] deprecate tls.secretName for novncproxy"

removes deprecated tls.secretName parameter. This reverts commit 58dd2ab. JIRA: OSPRH-6552
stuggi · Apr 29, 2024 · d19faee · d19faee
1 parent 58dd2ab
commit d19faee
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 36 deletions.
diff --git a/api/bases/nova.openstack.org_nova.yaml b/api/bases/nova.openstack.org_nova.yaml
@@ -1085,11 +1085,6 @@ spec:
                               description: CaBundleSecretName - holding the CA certs
                                 in a pre-created bundle file
                               type: string
-                            secretName:
-                              description: 'SecretName - holding the cert, key for
-                                the service Deprecated: will be removed in a follow
-                                up'
-                              type: string
                             service:
                               description: Service - Cert secret used for the nova
                                 novnc service endpoint

diff --git a/api/bases/nova.openstack.org_novacells.yaml b/api/bases/nova.openstack.org_novacells.yaml
@@ -731,10 +731,6 @@ spec:
                         description: CaBundleSecretName - holding the CA certs in
                           a pre-created bundle file
                         type: string
-                      secretName:
-                        description: 'SecretName - holding the cert, key for the service
-                          Deprecated: will be removed in a follow up'
-                        type: string
                       service:
                         description: Service - Cert secret used for the nova novnc
                           service endpoint

diff --git a/api/bases/nova.openstack.org_novanovncproxies.yaml b/api/bases/nova.openstack.org_novanovncproxies.yaml
@@ -336,10 +336,6 @@ spec:
                     description: CaBundleSecretName - holding the CA certs in a pre-created
                       bundle file
                     type: string
-                  secretName:
-                    description: 'SecretName - holding the cert, key for the service
-                      Deprecated: will be removed in a follow up'
-                    type: string
                   service:
                     description: Service - Cert secret used for the nova novnc service
                       endpoint

diff --git a/api/v1beta1/novanovncproxy_types.go b/api/v1beta1/novanovncproxy_types.go
@@ -80,11 +80,6 @@ type NovaNoVNCProxyTemplate struct {
 
 // TLSSection defines the desired state of TLS configuration
 type TLSSection struct {
-	// +kubebuilder:validation:Optional
-	// SecretName - holding the cert, key for the service
-	// Deprecated: will be removed in a follow up
-	SecretName *string `json:"secretName,omitempty"`
-
 	// +kubebuilder:validation:optional
 	//+operator-sdk:csv:customresourcedefinitions:type=spec
 	// Service - Cert secret used for the nova novnc service endpoint

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/nova.openstack.org_nova.yaml b/config/crd/bases/nova.openstack.org_nova.yaml
@@ -1085,11 +1085,6 @@ spec:
                               description: CaBundleSecretName - holding the CA certs
                                 in a pre-created bundle file
                               type: string
-                            secretName:
-                              description: 'SecretName - holding the cert, key for
-                                the service Deprecated: will be removed in a follow
-                                up'
-                              type: string
                             service:
                               description: Service - Cert secret used for the nova
                                 novnc service endpoint

diff --git a/config/crd/bases/nova.openstack.org_novacells.yaml b/config/crd/bases/nova.openstack.org_novacells.yaml
@@ -731,10 +731,6 @@ spec:
                         description: CaBundleSecretName - holding the CA certs in
                           a pre-created bundle file
                         type: string
-                      secretName:
-                        description: 'SecretName - holding the cert, key for the service
-                          Deprecated: will be removed in a follow up'
-                        type: string
                       service:
                         description: Service - Cert secret used for the nova novnc
                           service endpoint

diff --git a/config/crd/bases/nova.openstack.org_novanovncproxies.yaml b/config/crd/bases/nova.openstack.org_novanovncproxies.yaml
@@ -336,10 +336,6 @@ spec:
                     description: CaBundleSecretName - holding the CA certs in a pre-created
                       bundle file
                     type: string
-                  secretName:
-                    description: 'SecretName - holding the cert, key for the service
-                      Deprecated: will be removed in a follow up'
-                    type: string
                   service:
                     description: Service - Cert secret used for the nova novnc service
                       endpoint