Move apireg annotation to operator pod (#64)

Signed-off-by: Tamal Saha <tamal@appscode.com>
kubedb · Apr 24, 2020 · a1ad35c · a1ad35c
1 parent b02b054
commit a1ad35c
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 9 deletions.
diff --git a/api/crds/bindata.go b/api/crds/bindata.go
diff --git a/api/crds/installer.kubedb.com_kubedboperators.yaml b/api/crds/installer.kubedb.com_kubedboperators.yaml
@@ -1040,6 +1040,10 @@ spec:
               - repository
               - tag
               type: object
+            podAnnotations:
+              additionalProperties:
+                type: string
+              type: object
             podSecurityContext:
               description: 'PodSecurityContext holds pod-level security attributes
                 and common container settings. Optional: Defaults to empty.  See type

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -1061,6 +1061,12 @@
         "operator": {
           "$ref": "#/definitions/dev.kubedb.installer.apis.installer.v1alpha1.OperatorContainer"
         },
+        "podAnnotations": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
         "podSecurityContext": {
           "description": "PodSecurityContext holds pod-level security attributes and common container settings. Optional: Defaults to empty.  See type description for default values of each field.",
           "$ref": "#/definitions/io.k8s.api.core.v1.PodSecurityContext"

diff --git a/apis/installer/v1alpha1/kubedb_operator_types.go b/apis/installer/v1alpha1/kubedb_operator_types.go
@@ -84,6 +84,8 @@ type KubeDBOperatorSpec struct {
 	LogLevel int32 `json:"logLevel"`
 	// +optional
 	Annotations map[string]string `json:"annotations"`
+	//+optional
+	PodAnnotations map[string]string `json:"podAnnotations"`
 	// +optional
 	NodeSelector map[string]string `json:"nodeSelector"`
 	// If specified, the pod's tolerations.

diff --git a/apis/installer/v1alpha1/openapi_generated.go b/apis/installer/v1alpha1/openapi_generated.go
diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/kubedb/README.md b/charts/kubedb/README.md
@@ -58,7 +58,8 @@ The following table lists the configurable parameters of the KubeDB chart and th
 | `criticalAddon`                         | If true, installs KubeDB operator as critical addon                                                                                                                        | `false`                                                   |
 | `logLevel`                              | Log level for operator                                                                                                                                                     | `3`                                                       |
 | `affinity`                              | Affinity rules for pod assignment                                                                                                                                          | `{}`                                                      |
-| `annotations`                           | Annotations applied to operator pod(s)                                                                                                                                     | `{}`                                                      |
+| `annotations`                           | Annotations applied to operator deployment                                                                                                                                 | `{}`                                                      |
+| `podAnnotations`                        | Annotations applied to operator pod(s)                                                                                                                                     | `{}`                                                      |
 | `nodeSelector`                          | Node labels for pod assignment                                                                                                                                             | `{}`                                                      |
 | `tolerations`                           | Tolerations used pod assignment                                                                                                                                            | `{}`                                                      |
 | `resources.requests.cpu`                | CPU resources request                                                                                                                                                      | `100m`                                                    |

diff --git a/charts/kubedb/templates/deployment.yaml b/charts/kubedb/templates/deployment.yaml
@@ -8,9 +8,8 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kubedb.labels" . | nindent 4 }}
-  annotations:
-    checksum/apiregistration.yaml: {{ include (print $.Template.BasePath "/apiregistration.yaml") . | sha256sum }}
   {{- with .Values.annotations }}
+  annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
@@ -22,15 +21,14 @@ spec:
     metadata:
       labels:
         {{- include "kubedb.selectorLabels" . | nindent 8 }}
-    {{- if or .Values.annotations $criticalAddon }}
       annotations:
+        checksum/apiregistration.yaml: {{ include (print $.Template.BasePath "/apiregistration.yaml") . | sha256sum }}
       {{- if $criticalAddon }}
         scheduler.alpha.kubernetes.io/critical-pod: ''
       {{- end }}
-      {{- with .Values.annotations }}
+      {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
-    {{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/charts/kubedb/values.openapiv3_schema.yaml b/charts/kubedb/values.openapiv3_schema.yaml
@@ -943,6 +943,10 @@ properties:
     - repository
     - tag
     type: object
+  podAnnotations:
+    additionalProperties:
+      type: string
+    type: object
   podSecurityContext:
     description: 'PodSecurityContext holds pod-level security attributes and common
       container settings. Optional: Defaults to empty.  See type description for default

diff --git a/charts/kubedb/values.yaml b/charts/kubedb/values.yaml
@@ -64,10 +64,14 @@ criticalAddon: false
 ## Log level for operator
 logLevel: 3
 
-## Annotations passed to operator pod(s).
+## Annotations passed to operator deployment.
 ##
 annotations: {}
 
+## Annotations passed to operator pod(s).
+##
+podAnnotations: {}
+
 ## Node labels for pod assignment
 ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
 ##