rename replicationControllerAnnotations to workloadAnnotations

datainfrahq · Mar 20, 2024 · b71f372 · b71f372
1 parent ee37b18
commit b71f372
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 52 deletions.
diff --git a/apis/druid/v1alpha1/druid_types.go b/apis/druid/v1alpha1/druid_types.go
@@ -180,10 +180,10 @@ type DruidSpec struct {
 	// +optional
 	PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
 
-	// ReplicationControllerAnnotations annotations to be populated in StatefulSet or Deployment spec.
-	// if the same key is specified at both the DruidNodeSpec level and DruidSpec level, the DruidNodeSpec ReplicationControllerAnnotations will take precedence.
+	// WorkloadAnnotations annotations to be populated in StatefulSet or Deployment spec.
+	// if the same key is specified at both the DruidNodeSpec level and DruidSpec level, the DruidNodeSpec WorkloadAnnotations will take precedence.
 	// +optional
-	ReplicationControllerAnnotations map[string]string `json:"replicationControllerAnnotations,omitempty"`
+	WorkloadAnnotations map[string]string `json:"workloadAnnotations,omitempty"`
 
 	// PodManagementPolicy
 	// +optional
@@ -438,9 +438,9 @@ type DruidNodeSpec struct {
 	// +optional
 	IngressAnnotations map[string]string `json:"ingressAnnotations,omitempty"`
 
-	// ReplicationControllerAnnotations annotations to be populated in StatefulSet or Deployment spec.
+	// WorkloadAnnotations annotations to be populated in StatefulSet or Deployment spec.
 	// +optional
-	ReplicationControllerAnnotations map[string]string `json:"replicationControllerAnnotations,omitempty"`
+	WorkloadAnnotations map[string]string `json:"workloadAnnotations,omitempty"`
 
 	// Ingress Kubernetes Native `Ingress` specification.
 	// +optional

diff --git a/apis/druid/v1alpha1/zz_generated.deepcopy.go b/apis/druid/v1alpha1/zz_generated.deepcopy.go
diff --git a/chart/templates/crds/druid.apache.org_druids.yaml b/chart/templates/crds/druid.apache.org_druids.yaml
@@ -5715,12 +5715,6 @@ spec:
                       format: int32
                       minimum: 0
                       type: integer
-                    replicationControllerAnnotations:
-                      additionalProperties:
-                        type: string
-                      description: ReplicationControllerAnnotations annotations to
-                        be populated in StatefulSet or Deployment spec.
-                      type: object
                     resources:
                       description: Resources Kubernetes Native `resources` specification.
                       properties:
@@ -9031,6 +9025,12 @@ spec:
                         - name
                         type: object
                       type: array
+                    workloadAnnotations:
+                      additionalProperties:
+                        type: string
+                      description: WorkloadAnnotations annotations to be populated
+                        in StatefulSet or Deployment spec.
+                      type: object
                   required:
                   - druid.port
                   - nodeConfigMountPath
@@ -9203,14 +9203,6 @@ spec:
                     format: int32
                     type: integer
                 type: object
-              replicationControllerAnnotations:
-                additionalProperties:
-                  type: string
-                description: ReplicationControllerAnnotations annotations to be populated
-                  in StatefulSet or Deployment spec. if the same key is specified
-                  at both the DruidNodeSpec level and DruidSpec level, the DruidNodeSpec
-                  ReplicationControllerAnnotations will take precedence.
-                type: object
               rollingDeploy:
                 default: true
                 description: 'RollingDeploy Whether to deploy the components in a
@@ -12108,6 +12100,14 @@ spec:
                   - name
                   type: object
                 type: array
+              workloadAnnotations:
+                additionalProperties:
+                  type: string
+                description: WorkloadAnnotations annotations to be populated in StatefulSet
+                  or Deployment spec. if the same key is specified at both the DruidNodeSpec
+                  level and DruidSpec level, the DruidNodeSpec WorkloadAnnotations
+                  will take precedence.
+                type: object
               zookeeper:
                 description: 'Zookeeper IGNORED (Future API): In order to make Druid
                   dependency setup extensible from within Druid operator.'

diff --git a/config/crd/bases/druid.apache.org_druids.yaml b/config/crd/bases/druid.apache.org_druids.yaml
@@ -5715,12 +5715,6 @@ spec:
                       format: int32
                       minimum: 0
                       type: integer
-                    replicationControllerAnnotations:
-                      additionalProperties:
-                        type: string
-                      description: ReplicationControllerAnnotations annotations to
-                        be populated in StatefulSet or Deployment spec.
-                      type: object
                     resources:
                       description: Resources Kubernetes Native `resources` specification.
                       properties:
@@ -9031,6 +9025,12 @@ spec:
                         - name
                         type: object
                       type: array
+                    workloadAnnotations:
+                      additionalProperties:
+                        type: string
+                      description: WorkloadAnnotations annotations to be populated
+                        in StatefulSet or Deployment spec.
+                      type: object
                   required:
                   - druid.port
                   - nodeConfigMountPath
@@ -9203,14 +9203,6 @@ spec:
                     format: int32
                     type: integer
                 type: object
-              replicationControllerAnnotations:
-                additionalProperties:
-                  type: string
-                description: ReplicationControllerAnnotations annotations to be populated
-                  in StatefulSet or Deployment spec. if the same key is specified
-                  at both the DruidNodeSpec level and DruidSpec level, the DruidNodeSpec
-                  ReplicationControllerAnnotations will take precedence.
-                type: object
               rollingDeploy:
                 default: true
                 description: 'RollingDeploy Whether to deploy the components in a
@@ -12108,6 +12100,14 @@ spec:
                   - name
                   type: object
                 type: array
+              workloadAnnotations:
+                additionalProperties:
+                  type: string
+                description: WorkloadAnnotations annotations to be populated in StatefulSet
+                  or Deployment spec. if the same key is specified at both the DruidNodeSpec
+                  level and DruidSpec level, the DruidNodeSpec WorkloadAnnotations
+                  will take precedence.
+                type: object
               zookeeper:
                 description: 'Zookeeper IGNORED (Future API): In order to make Druid
                   dependency setup extensible from within Druid operator.'

diff --git a/controllers/druid/handler.go b/controllers/druid/handler.go
@@ -1294,11 +1294,11 @@ func makeLabelsForNodeSpec(nodeSpec *v1alpha1.DruidNodeSpec, m *v1alpha1.Druid,
 func makeAnnotationsForReplicationController(nodeSpec *v1alpha1.DruidNodeSpec, m *v1alpha1.Druid) map[string]string {
 	var annotations = map[string]string{}
 
-	if nodeSpec.ReplicationControllerAnnotations != nil && m.Spec.ReplicationControllerAnnotations != nil {
-		annotations = m.Spec.ReplicationControllerAnnotations
+	if m.Spec.WorkloadAnnotations != nil {
+		annotations = m.Spec.WorkloadAnnotations
 	}
 
-	for k, v := range nodeSpec.ReplicationControllerAnnotations {
+	for k, v := range nodeSpec.WorkloadAnnotations {
 		annotations[k] = v
 	}
 

diff --git a/controllers/druid/testdata/druid-test-cr.yaml b/controllers/druid/testdata/druid-test-cr.yaml
@@ -7,7 +7,7 @@ spec:
   image: himanshu01/druid:druid-0.12.0-1
   defaultProbes: true
   priorityClassName: high-priority
-  replicationControllerAnnotations:
+  workloadAnnotations:
     kubernetes.io/cluster-scoped-annotation: "cluster"
     kubernetes.io/override-annotation: "cluster-scoped-annotation"
   podAnnotations:
@@ -112,7 +112,7 @@ spec:
   nodes:
     brokers:
       nodeType: "broker"
-      replicationControllerAnnotations:
+      workloadAnnotations:
         kubernetes.io/node-scoped-annotation: "broker"
         kubernetes.io/override-annotation: "node-scoped-annotation"
       services:

diff --git a/docs/api_specifications/druid.md b/docs/api_specifications/druid.md
@@ -609,15 +609,15 @@ map[string]string
 </tr>
 <tr>
 <td>
-<code>replicationControllerAnnotations</code><br>
+<code>workloadAnnotations</code><br>
 <em>
 map[string]string
 </em>
 </td>
 <td>
 <em>(Optional)</em>
-<p>ReplicationControllerAnnotations annotations to be populated in StatefulSet or Deployment spec.
-if the same key is specified at both the DruidNodeSpec level and DruidSpec level, the DruidNodeSpec ReplicationControllerAnnotations will take precedence.</p>
+<p>WorkloadAnnotations annotations to be populated in StatefulSet or Deployment spec.
+if the same key is specified at both the DruidNodeSpec level and DruidSpec level, the DruidNodeSpec WorkloadAnnotations will take precedence.</p>
 </td>
 </tr>
 <tr>
@@ -1806,14 +1806,14 @@ map[string]string
 </tr>
 <tr>
 <td>
-<code>replicationControllerAnnotations</code><br>
+<code>workloadAnnotations</code><br>
 <em>
 map[string]string
 </em>
 </td>
 <td>
 <em>(Optional)</em>
-<p>ReplicationControllerAnnotations annotations to be populated in StatefulSet or Deployment spec.</p>
+<p>WorkloadAnnotations annotations to be populated in StatefulSet or Deployment spec.</p>
 </td>
 </tr>
 <tr>
@@ -2328,15 +2328,15 @@ map[string]string
 </tr>
 <tr>
 <td>
-<code>replicationControllerAnnotations</code><br>
+<code>workloadAnnotations</code><br>
 <em>
 map[string]string
 </em>
 </td>
 <td>
 <em>(Optional)</em>
-<p>ReplicationControllerAnnotations annotations to be populated in StatefulSet or Deployment spec.
-if the same key is specified at both the DruidNodeSpec level and DruidSpec level, the DruidNodeSpec ReplicationControllerAnnotations will take precedence.</p>
+<p>WorkloadAnnotations annotations to be populated in StatefulSet or Deployment spec.
+if the same key is specified at both the DruidNodeSpec level and DruidSpec level, the DruidNodeSpec WorkloadAnnotations will take precedence.</p>
 </td>
 </tr>
 <tr>

diff --git a/e2e/configs/druid-cr.yaml b/e2e/configs/druid-cr.yaml
@@ -13,7 +13,7 @@ spec:
     release: alpha
   podAnnotations:
     dummy: k8s_extn_needs_atleast_one_annotation
-  replicationControllerAnnotations:
+  workloadAnnotations:
     kubernetes.io/cluster-scoped-annotation: "cluster"
   readinessProbe:
     httpGet:
@@ -131,7 +131,7 @@ spec:
       # imagePullSecrets:
       # - name: tutu
       priorityClassName: system-cluster-critical 
-      replicationControllerAnnotations:
+      workloadAnnotations:
         kubernetes.io/node-scoped-annotation: "broker"
       druid.port: 8088
       services: