public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into storage-resize-fixes

This commit is contained in:
Felix Kunde 2020-11-05 12:07:04 +01:00
parent b4ba10297b b379db20ed
commit 705785ec31
5 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
charts/postgres-operator/crds/operatorconfigurations.yaml
View File

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

16
charts/postgres-operator/crds/postgresqls.yaml
View File

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

28
manifests/operatorconfiguration.crd.yaml
View File

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

16
manifests/postgresql.crd.yaml
View File

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

4
pkg/controller/util.go
View File

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