Add watcher-applier deployment to WatcherApplier controller

Adds a statefulset deployment of watcher-applier into WatcherApplier
controller.
Includes templates for watcher-applier configuration.

api/bases/watcher.openstack.org_watcherappliers.yaml

@@ -86,7 +86,7 @@ spec:
                 default: 1
                 description: Replicas of Watcher service to run
                 format: int32
-                maximum: 32
+                maximum: 1
                 minimum: 0
                 type: integer
               resources:
@@ -251,6 +251,10 @@ spec:
                   the openstack-operator in the top-level CR (e.g. the ContainerImage)
                 format: int64
                 type: integer
+              readyCount:
+                description: ReadyCount of watcher Applier instances
+                format: int32
+                type: integer
             type: object
         type: object
     served: true

api/bases/watcher.openstack.org_watcherdecisionengines.yaml

@@ -87,7 +87,7 @@ spec:
                 default: 1
                 description: Replicas of Watcher service to run
                 format: int32
-                maximum: 32
+                maximum: 1
                 minimum: 0
                 type: integer
               resources:

api/v1beta1/common_types.go

@@ -122,13 +122,6 @@ type WatcherSubCrsCommon struct {
 	// The service specific Container Image URL (will be set to environmental default if empty)
 	ContainerImage string `json:"containerImage"`
 
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=1
-	// +kubebuilder:validation:Maximum=32
-	// +kubebuilder:validation:Minimum=0
-	// Replicas of Watcher service to run
-	Replicas *int32 `json:"replicas"`
-
 	// +kubebuilder:validation:Optional
 	// Resources - Compute Resources required by this service (Limits/Requests).
 	// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/

api/v1beta1/watcherapi_types.go

@@ -35,6 +35,13 @@ type WatcherAPISpec struct {
 
 	WatcherSubCrsCommon `json:",inline"`
 
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=1
+	// +kubebuilder:validation:Maximum=32
+	// +kubebuilder:validation:Minimum=0
+	// Replicas of Watcher service to run
+	Replicas *int32 `json:"replicas"`
+
 	// +kubebuilder:validation:Optional
 	// Override, provides the ability to override the generated manifest of
 	// several child resources.

api/v1beta1/watcherapplier_types.go

@@ -36,6 +36,13 @@ type WatcherApplierSpec struct {
 	Secret string `json:"secret"`
 
 	WatcherSubCrsCommon `json:",inline"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=1
+	// +kubebuilder:validation:Maximum=1
+	// +kubebuilder:validation:Minimum=0
+	// Replicas of Watcher service to run
+	Replicas *int32 `json:"replicas"`
 }
 
 // WatcherApplierStatus defines the observed state of WatcherApplier
@@ -52,9 +59,8 @@ type WatcherApplierStatus struct {
 	// the openstack-operator in the top-level CR (e.g. the ContainerImage)
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
-	// TODO(dviroel): Add ReadyCount once Deployment is implemented
 	// ReadyCount of watcher Applier instances
-	// ReadyCount int32 `json:"readyCount,omitempty"`
+	ReadyCount int32 `json:"readyCount,omitempty"`
 
 	// Map of hashes to track e.g. job status
 	Hash map[string]string `json:"hash,omitempty"`

api/v1beta1/watcherdecisionengine_types.go

@@ -35,6 +35,13 @@ type WatcherDecisionEngineSpec struct {
 	Secret string `json:"secret"`
 
 	WatcherSubCrsCommon `json:",inline"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=1
+	// +kubebuilder:validation:Maximum=1
+	// +kubebuilder:validation:Minimum=0
+	// Replicas of Watcher service to run
+	Replicas *int32 `json:"replicas"`
 }
 
 // WatcherDecisionEngineStatus defines the observed state of WatcherDecisionEngine

config/crd/bases/watcher.openstack.org_watcherappliers.yaml

@@ -86,7 +86,7 @@ spec:
                 default: 1
                 description: Replicas of Watcher service to run
                 format: int32
-                maximum: 32
+                maximum: 1
                 minimum: 0
                 type: integer
               resources:
@@ -251,6 +251,10 @@ spec:
                   the openstack-operator in the top-level CR (e.g. the ContainerImage)
                 format: int64
                 type: integer
+              readyCount:
+                description: ReadyCount of watcher Applier instances
+                format: int32
+                type: integer
             type: object
         type: object
     served: true

config/crd/bases/watcher.openstack.org_watcherdecisionengines.yaml

@@ -87,7 +87,7 @@ spec:
                 default: 1
                 description: Replicas of Watcher service to run
                 format: int32
-                maximum: 32
+                maximum: 1
                 minimum: 0
                 type: integer
               resources:

config/rbac/role.yaml

@@ -39,6 +39,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - apps
+  resources:
+  - statefulsets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - batch
   resources:

controllers/watcher_controller.go

@@ -817,10 +817,10 @@ func (r *WatcherReconciler) ensureAPI(
 		},
 		WatcherSubCrsCommon: watcherv1beta1.WatcherSubCrsCommon{
 			ContainerImage: instance.Spec.APIContainerImageURL,
-			Replicas:       instance.Spec.APIServiceTemplate.Replicas,
 			Resources:      instance.Spec.APIServiceTemplate.Resources,
 			ServiceAccount: "watcher-" + instance.Name,
 		},
+		Replicas: instance.Spec.APIServiceTemplate.Replicas,
 		Override: instance.Spec.APIServiceTemplate.Override,
 	}