Merge branch 'master' into storage-resize-fixes

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -26,22 +26,22 @@ spec:
     - name: Image
       type: string
       description: Spilo image to be used for Pods
-      JSONPath: .configuration.docker_image
+      jsonPath: .configuration.docker_image
     - name: Cluster-Label
       type: string
       description: Label for K8s resources created by operator
-      JSONPath: .configuration.kubernetes.cluster_name_label
+      jsonPath: .configuration.kubernetes.cluster_name_label
     - name: Service-Account
       type: string
       description: Name of service account to be used
-      JSONPath: .configuration.kubernetes.pod_service_account_name
+      jsonPath: .configuration.kubernetes.pod_service_account_name
     - name: Min-Instances
       type: integer
       description: Minimum number of instances per Postgres cluster
-      JSONPath: .configuration.min_instances
+      jsonPath: .configuration.min_instances
     - name: Age
       type: date
-      JSONPath: .metadata.creationTimestamp
+      jsonPath: .metadata.creationTimestamp
     schema:
       openAPIV3Schema:
         type: object
@@ -49,15 +49,15 @@ spec:
           - kind
           - apiVersion
           - configuration
-          properties:
-            kind:
-              type: string
-              enum:
-              - OperatorConfiguration
-            apiVersion:
-              type: string
-              enum:
-              - acid.zalan.do/v1
+        properties:
+          kind:
+            type: string
+            enum:
+            - OperatorConfiguration
+          apiVersion:
+            type: string
+            enum:
+            - acid.zalan.do/v1
           configuration:
             type: object
             properties:

charts/postgres-operator/crds/postgresqls.yaml

@@ -26,34 +26,34 @@ spec:
     - name: Team
       type: string
       description: Team responsible for Postgres CLuster
-      JSONPath: .spec.teamId
+      jsonPath: .spec.teamId
     - name: Version
       type: string
       description: PostgreSQL version
-      JSONPath: .spec.postgresql.version
+      jsonPath: .spec.postgresql.version
     - name: Pods
       type: integer
       description: Number of Pods per Postgres cluster
-      JSONPath: .spec.numberOfInstances
+      jsonPath: .spec.numberOfInstances
     - name: Volume
       type: string
       description: Size of the bound volume
-      JSONPath: .spec.volume.size
+      jsonPath: .spec.volume.size
     - name: CPU-Request
       type: string
       description: Requested CPU for Postgres containers
-      JSONPath: .spec.resources.requests.cpu
+      jsonPath: .spec.resources.requests.cpu
     - name: Memory-Request
       type: string
       description: Requested memory for Postgres containers
-      JSONPath: .spec.resources.requests.memory
+      jsonPath: .spec.resources.requests.memory
     - name: Age
       type: date
-      JSONPath: .metadata.creationTimestamp
+      jsonPath: .metadata.creationTimestamp
     - name: Status
       type: string
       description: Current sync status of postgresql resource
-      JSONPath: .status.PostgresClusterStatus
+      jsonPath: .status.PostgresClusterStatus
     schema:
       openAPIV3Schema:
         type: object

manifests/operatorconfiguration.crd.yaml

@@ -22,22 +22,22 @@ spec:
     - name: Image
       type: string
       description: Spilo image to be used for Pods
-      JSONPath: .configuration.docker_image
+      jsonPath: .configuration.docker_image
     - name: Cluster-Label
       type: string
       description: Label for K8s resources created by operator
-      JSONPath: .configuration.kubernetes.cluster_name_label
+      jsonPath: .configuration.kubernetes.cluster_name_label
     - name: Service-Account
       type: string
       description: Name of service account to be used
-      JSONPath: .configuration.kubernetes.pod_service_account_name
+      jsonPath: .configuration.kubernetes.pod_service_account_name
     - name: Min-Instances
       type: integer
       description: Minimum number of instances per Postgres cluster
-      JSONPath: .configuration.min_instances
+      jsonPath: .configuration.min_instances
     - name: Age
       type: date
-      JSONPath: .metadata.creationTimestamp
+      jsonPath: .metadata.creationTimestamp
     schema:
       openAPIV3Schema:
         type: object
@@ -45,15 +45,15 @@ spec:
           - kind
           - apiVersion
           - configuration
-          properties:
-            kind:
-              type: string
-              enum:
-              - OperatorConfiguration
-            apiVersion:
-              type: string
-              enum:
-              - acid.zalan.do/v1
+        properties:
+          kind:
+            type: string
+            enum:
+            - OperatorConfiguration
+          apiVersion:
+            type: string
+            enum:
+            - acid.zalan.do/v1
           configuration:
             type: object
             properties:

manifests/postgresql.crd.yaml

@@ -22,34 +22,34 @@ spec:
     - name: Team
       type: string
       description: Team responsible for Postgres CLuster
-      JSONPath: .spec.teamId
+      jsonPath: .spec.teamId
     - name: Version
       type: string
       description: PostgreSQL version
-      JSONPath: .spec.postgresql.version
+      jsonPath: .spec.postgresql.version
     - name: Pods
       type: integer
       description: Number of Pods per Postgres cluster
-      JSONPath: .spec.numberOfInstances
+      jsonPath: .spec.numberOfInstances
     - name: Volume
       type: string
       description: Size of the bound volume
-      JSONPath: .spec.volume.size
+      jsonPath: .spec.volume.size
     - name: CPU-Request
       type: string
       description: Requested CPU for Postgres containers
-      JSONPath: .spec.resources.requests.cpu
+      jsonPath: .spec.resources.requests.cpu
     - name: Memory-Request
       type: string
       description: Requested memory for Postgres containers
-      JSONPath: .spec.resources.requests.memory
+      jsonPath: .spec.resources.requests.memory
     - name: Age
       type: date
-      JSONPath: .metadata.creationTimestamp
+      jsonPath: .metadata.creationTimestamp
     - name: Status
       type: string
       description: Current sync status of postgresql resource
-      JSONPath: .status.PostgresClusterStatus
+      jsonPath: .status.PostgresClusterStatus
     schema:
       openAPIV3Schema:
         type: object

pkg/controller/util.go

@@ -341,9 +341,7 @@ func (c *Controller) getInfrastructureRole(
 				util.Coalesce(string(secretData[infraRole.RoleKey]), infraRole.DefaultRoleValue))
 		}
 
-		if roleDescr.Valid() {
-			roles = append(roles, *roleDescr)
-		} else {
+		if !roleDescr.Valid() {
 			msg := "infrastructure role %q is not complete and ignored"
 			c.logger.Warningf(msg, roleDescr)