From b037bc37770772c89c549132ca2d2e917c306bb2 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Wed, 23 Mar 2022 14:38:42 +0100 Subject: [PATCH] fix merge errors --- manifests/operatorconfiguration.crd.yaml | 114 +++++++++++------------ pkg/cluster/cluster_test.go | 8 -- 2 files changed, 52 insertions(+), 70 deletions(-) diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml index 2d22a5daa..173e83c51 100644 --- a/manifests/operatorconfiguration.crd.yaml +++ b/manifests/operatorconfiguration.crd.yaml @@ -10,9 +10,9 @@ spec: plural: operatorconfigurations singular: operatorconfiguration shortNames: - - opconfig + - opconfig categories: - - all + - all scope: Namespaced versions: - name: v1 @@ -115,46 +115,10 @@ spec: type: object additionalProperties: type: string - default: "registry.opensource.zalan.do/acid/spilo-13:2.0-p6" - enable_crd_validation: - type: boolean - default: true - enable_lazy_spilo_upgrade: - type: boolean - default: false - enable_pgversion_env_var: - type: boolean - default: true - enable_shm_volume: - type: boolean - default: true - enable_spilo_wal_path_compat: - type: boolean - default: false - etcd_host: - type: string - default: "" - kubernetes_use_configmaps: - type: boolean - default: false - max_instances: - type: integer - minimum: -1 # -1 = disabled - default: -1 - min_instances: - type: integer - minimum: -1 # -1 = disabled - default: -1 - resync_period: - type: string - default: "30m" - repair_period: - type: string - default: "5m" - set_memory_request_to_limit: - type: boolean - default: false - sidecar_docker_images: + sidecars: + type: array + nullable: true + items: type: object x-kubernetes-preserve-unknown-fields: true workers: @@ -209,23 +173,19 @@ spec: type: string cluster_domain: type: string - sidecars: - type: array - nullable: true - items: + default: "cluster.local" + cluster_labels: type: object - x-kubernetes-preserve-unknown-fields: true - workers: - type: integer - minimum: 1 - default: 8 - users: - type: object - properties: - replication_username: + additionalProperties: type: string - default: standby - super_username: + default: + application: spilo + cluster_name_label: + type: string + default: "cluster-name" + custom_pod_annotations: + type: object + additionalProperties: type: string delete_annotation_date_key: type: string @@ -261,11 +221,41 @@ spec: nullable: true items: type: object - additionalProperties: - type: string - default: - application: spilo - cluster_name_label: + required: + - secretname + - userkey + - passwordkey + properties: + secretname: + type: string + userkey: + type: string + passwordkey: + type: string + rolekey: + type: string + defaultuservalue: + type: string + defaultrolevalue: + type: string + details: + type: string + template: + type: boolean + inherited_annotations: + type: array + items: + type: string + inherited_labels: + type: array + items: + type: string + master_pod_move_timeout: + type: string + default: "20m" + node_readiness_label: + type: object + additionalProperties: type: string node_readiness_label_merge: type: string diff --git a/pkg/cluster/cluster_test.go b/pkg/cluster/cluster_test.go index ae87fcf0c..1a45bdfb8 100644 --- a/pkg/cluster/cluster_test.go +++ b/pkg/cluster/cluster_test.go @@ -1055,14 +1055,6 @@ func TestCompareEnv(t *testing.T) { } } -func newFakeK8sServiceClient() (k8sutil.KubernetesClient, *fake.Clientset) { - clientSet := fake.NewSimpleClientset() - - return k8sutil.KubernetesClient{ - ServicesGetter: clientSet.CoreV1(), - }, clientSet -} - func newService(ann map[string]string, svcT v1.ServiceType, lbSr []string) *v1.Service { svc := &v1.Service{ Spec: v1.ServiceSpec{