Add default passwordSelector value

openstack-k8s-operators · Jun 27, 2023 · 0e5e1e8 · 0e5e1e8
1 parent 897a859
commit 0e5e1e8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/api/v1beta1/swiftproxy_types.go b/api/v1beta1/swiftproxy_types.go
@@ -57,9 +57,10 @@ type SwiftProxySpec struct {
 	// Secret containing OpenStack password information for Swift service user password
 	Secret string `json:"secret,omitempty"`
 
-	// +kubebuilder:validation:required
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default={service: SwiftPassword}
 	// PasswordSelector - Selector to choose the Swift user password from the Secret
-	PasswordSelectors PasswordSelector `json:"passwordSelectors,omitempty"`
+	PasswordSelectors PasswordSelector `json:"passwordSelectors"`
 
 	// +kubebuilder:validation:required
 	// +kubebuilder:default=swift-conf

diff --git a/config/crd/bases/swift.openstack.org_swiftproxies.yaml b/config/crd/bases/swift.openstack.org_swiftproxies.yaml
@@ -51,6 +51,8 @@ spec:
                 description: Swift Proxy Container Image URL
                 type: string
               passwordSelectors:
+                default:
+                  service: SwiftPassword
                 description: PasswordSelector - Selector to choose the Swift user
                   password from the Secret
                 properties:

diff --git a/config/crd/bases/swift.openstack.org_swifts.yaml b/config/crd/bases/swift.openstack.org_swifts.yaml
@@ -64,6 +64,8 @@ spec:
                     description: Swift Proxy Container Image URL
                     type: string
                   passwordSelectors:
+                    default:
+                      service: SwiftPassword
                     description: PasswordSelector - Selector to choose the Swift user
                       password from the Secret
                     properties: