Introduce DefaultReplicas in target

dtaniwaki · Mar 22, 2022 · dc44311 · dc44311
1 parent 4be5093
commit dc44311
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 8 deletions.
diff --git a/api/v1alpha1/lendingconfig_types.go b/api/v1alpha1/lendingconfig_types.go
@@ -66,6 +66,8 @@ type Target struct {
 	Kind string `json:"kind,omitempty"`
 	// Name is ...
 	Name *string `json:"name,omitempty"`
+	// DefaultReplicas
+	DefaultReplicas *int64 `json:"defaultReplicas,omitempty"`
 }
 
 // LendingConfigSpec defines the desired state of LendingConfig

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/clusterlendingmanager.dtaniwaki.github.com_lendingconfigs.yaml b/config/crd/bases/clusterlendingmanager.dtaniwaki.github.com_lendingconfigs.yaml
@@ -186,6 +186,10 @@ spec:
                     apiVersion:
                       description: APIVersion is ...
                       type: string
+                    defaultReplicas:
+                      description: DefaultReplicas
+                      format: int64
+                      type: integer
                     kind:
                       description: Kind is ...
                       type: string

diff --git a/config/samples/clusterlendingmanager_v1alpha1_lendingconfig.yaml b/config/samples/clusterlendingmanager_v1alpha1_lendingconfig.yaml
@@ -6,6 +6,7 @@ spec:
   targets:
   - kind: Deployment
     apiVersion: apps/v1
+    defaultReplicas: 1
   timezone: "Asia/Tokyo"
   schedule:
     default:

diff --git a/config/samples/deployment.yaml b/config/samples/deployment.yaml
@@ -2,8 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: cluster-lending-manager-nginx
-  annotations:
-    clusterlendingmanager.dtaniwaki.github.com/default-replicas: "1"
 spec:
   replicas: 1
   selector:

diff --git a/controllers/lendingconfig.go b/controllers/lendingconfig.go
@@ -278,13 +278,23 @@ func (config *LendingConfig) ActivateTargetResources(ctx context.Context, reconc
 				}
 			}
 
-			if defaultReplicasStr, exists := annotations[annotationNameDefaultReplicas]; exists {
-				defaultReplicas, err := strconv.ParseInt(defaultReplicasStr, 10, 64)
-				if err != nil {
-					return errors.WithStack(err)
+			if lastReplicas == nil {
+				if defaultReplicasStr, exists := annotations[annotationNameDefaultReplicas]; exists {
+					defaultReplicas, err := strconv.ParseInt(defaultReplicasStr, 10, 64)
+					if err != nil {
+						return errors.WithStack(err)
+					}
+					logger.Info(fmt.Sprintf("Use per-resource default replicas=%d.", defaultReplicas))
+					lastReplicas = &defaultReplicas
+				}
+			}
+
+			if lastReplicas == nil {
+				if target.DefaultReplicas != nil {
+					defaultReplicas := *target.DefaultReplicas
+					logger.Info(fmt.Sprintf("Use target default replicas=%d.", defaultReplicas))
+					lastReplicas = &defaultReplicas
 				}
-				logger.Info(fmt.Sprintf("Use default replicas=%d.", defaultReplicas))
-				lastReplicas = &defaultReplicas
 			}
 
 			if lastReplicas == nil {