Merge pull request #201 from cschwede/fix-partpower-setting

Fix PartPower setting & speed up replication kuttl test
openstack-k8s-operators · Apr 16, 2024 · 6b594fb · 6b594fb
2 parents f3397ce + 223e8ef
commit 6b594fb
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 5 deletions.
diff --git a/api/bases/swift.openstack.org_swiftrings.yaml b/api/bases/swift.openstack.org_swiftrings.yaml
@@ -49,7 +49,7 @@ spec:
                 type: string
               minPartHours:
                 default: 1
-                description: Minimum numbeir of hours to restrict moving a partition
+                description: Minimum number of hours to restrict moving a partition
                   more than once
                 format: int64
                 minimum: 1

diff --git a/api/bases/swift.openstack.org_swifts.yaml b/api/bases/swift.openstack.org_swifts.yaml
@@ -357,7 +357,7 @@ spec:
                     type: string
                   minPartHours:
                     default: 1
-                    description: Minimum numbeir of hours to restrict moving a partition
+                    description: Minimum number of hours to restrict moving a partition
                       more than once
                     format: int64
                     minimum: 1

diff --git a/api/v1beta1/swiftring_types.go b/api/v1beta1/swiftring_types.go
@@ -60,7 +60,7 @@ type SwiftRingSpecCore struct {
 	// +kubebuilder:validation:Required
 	// +kubebuilder:default=1
 	// +kubebuilder:validation:Minimum=1
-	// Minimum numbeir of hours to restrict moving a partition more than once
+	// Minimum number of hours to restrict moving a partition more than once
 	MinPartHours *int64 `json:"minPartHours"`
 
 	// +kubebuilder:validation:Optional

diff --git a/config/crd/bases/swift.openstack.org_swiftrings.yaml b/config/crd/bases/swift.openstack.org_swiftrings.yaml
@@ -49,7 +49,7 @@ spec:
                 type: string
               minPartHours:
                 default: 1
-                description: Minimum numbeir of hours to restrict moving a partition
+                description: Minimum number of hours to restrict moving a partition
                   more than once
                 format: int64
                 minimum: 1

diff --git a/config/crd/bases/swift.openstack.org_swifts.yaml b/config/crd/bases/swift.openstack.org_swifts.yaml
@@ -357,7 +357,7 @@ spec:
                     type: string
                   minPartHours:
                     default: 1
-                    description: Minimum numbeir of hours to restrict moving a partition
+                    description: Minimum number of hours to restrict moving a partition
                       more than once
                     format: int64
                     minimum: 1

diff --git a/controllers/swift_controller.go b/controllers/swift_controller.go
@@ -373,6 +373,8 @@ func (r *SwiftReconciler) ringCreateOrUpdate(ctx context.Context, instance *swif
 		ContainerImage: instance.Spec.SwiftRing.ContainerImage,
 		SwiftRingSpecCore: swiftv1.SwiftRingSpecCore{
 			RingReplicas: instance.Spec.SwiftRing.RingReplicas,
+			PartPower:    instance.Spec.SwiftRing.PartPower,
+			MinPartHours: instance.Spec.SwiftRing.MinPartHours,
 			TLS:          instance.Spec.SwiftProxy.TLS.Ca,
 		},
 	}

diff --git a/tests/kuttl/tests/replication/deploy/kustomization.yaml b/tests/kuttl/tests/replication/deploy/kustomization.yaml
@@ -7,6 +7,9 @@ patches:
     - op: replace
       path: /spec/swiftRing/ringReplicas
       value: 3
+    - op: replace
+      path: /spec/swiftRing/partPower
+      value: 2
     - op: replace
       path: /spec/swiftStorage/replicas
       value: 3