update spilo image with checksums fix for upgrade
This commit is contained in:
parent
4a5f1a69a0
commit
a2f2ae591a
|
|
@ -68,7 +68,7 @@ spec:
|
||||||
type: string
|
type: string
|
||||||
docker_image:
|
docker_image:
|
||||||
type: string
|
type: string
|
||||||
default: "ghcr.io/zalando/spilo-18-dev:ee756c9e"
|
default: "ghcr.io/zalando/spilo-18-dev:6393e80e"
|
||||||
enable_crd_registration:
|
enable_crd_registration:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: true
|
default: true
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ configGeneral:
|
||||||
# etcd connection string for Patroni. Empty uses K8s-native DCS.
|
# etcd connection string for Patroni. Empty uses K8s-native DCS.
|
||||||
etcd_host: ""
|
etcd_host: ""
|
||||||
# Spilo docker image
|
# Spilo docker image
|
||||||
docker_image: ghcr.io/zalando/spilo-18-dev:ee756c9e
|
docker_image: ghcr.io/zalando/spilo-18-dev:6393e80e
|
||||||
|
|
||||||
# key name for annotation to ignore globally configured instance limits
|
# key name for annotation to ignore globally configured instance limits
|
||||||
# ignore_instance_limits_annotation_key: ""
|
# ignore_instance_limits_annotation_key: ""
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ IFS=$'\n\t'
|
||||||
|
|
||||||
readonly cluster_name="postgres-operator-e2e-tests"
|
readonly cluster_name="postgres-operator-e2e-tests"
|
||||||
readonly kubeconfig_path="${HOME}/kind-config-${cluster_name}"
|
readonly kubeconfig_path="${HOME}/kind-config-${cluster_name}"
|
||||||
readonly spilo_image="ghcr.io/zalando/spilo-18-dev:ee756c9e"
|
readonly spilo_image="ghcr.io/zalando/spilo-18-dev:6393e80e"
|
||||||
readonly e2e_test_runner_image="ghcr.io/zalando/postgres-operator-e2e-tests-runner:latest"
|
readonly e2e_test_runner_image="ghcr.io/zalando/postgres-operator-e2e-tests-runner:latest"
|
||||||
|
|
||||||
export GOPATH=${GOPATH-~/go}
|
export GOPATH=${GOPATH-~/go}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ from kubernetes.client.rest import ApiException
|
||||||
|
|
||||||
SPILO_CURRENT = "ghcr.io/zalando/spilo-e2e:dev-18.3"
|
SPILO_CURRENT = "ghcr.io/zalando/spilo-e2e:dev-18.3"
|
||||||
SPILO_LAZY = "ghcr.io/zalando/spilo-e2e:dev-18.4"
|
SPILO_LAZY = "ghcr.io/zalando/spilo-e2e:dev-18.4"
|
||||||
SPILO_FULL_IMAGE = "ghcr.io/zalando/spilo-18-dev:ee756c9e"
|
SPILO_FULL_IMAGE = "ghcr.io/zalando/spilo-18-dev:6393e80e"
|
||||||
|
|
||||||
def to_selector(labels):
|
def to_selector(labels):
|
||||||
return ",".join(["=".join(lbl) for lbl in labels.items()])
|
return ",".join(["=".join(lbl) for lbl in labels.items()])
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ metadata:
|
||||||
# "delete-date": "2020-08-31" # can only be deleted on that day if "delete-date "key is configured
|
# "delete-date": "2020-08-31" # can only be deleted on that day if "delete-date "key is configured
|
||||||
# "delete-clustername": "acid-test-cluster" # can only be deleted when name matches if "delete-clustername" key is configured
|
# "delete-clustername": "acid-test-cluster" # can only be deleted when name matches if "delete-clustername" key is configured
|
||||||
spec:
|
spec:
|
||||||
dockerImage: ghcr.io/zalando/spilo-18-dev:ee756c9e
|
dockerImage: ghcr.io/zalando/spilo-18-dev:6393e80e
|
||||||
teamId: "acid"
|
teamId: "acid"
|
||||||
numberOfInstances: 2
|
numberOfInstances: 2
|
||||||
users: # Application/Robot users
|
users: # Application/Robot users
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ data:
|
||||||
default_memory_request: 100Mi
|
default_memory_request: 100Mi
|
||||||
# delete_annotation_date_key: delete-date
|
# delete_annotation_date_key: delete-date
|
||||||
# delete_annotation_name_key: delete-clustername
|
# delete_annotation_name_key: delete-clustername
|
||||||
docker_image: ghcr.io/zalando/spilo-18-dev:ee756c9e
|
docker_image: ghcr.io/zalando/spilo-18-dev:6393e80e
|
||||||
# downscaler_annotations: "deployment-time,downscaler/*"
|
# downscaler_annotations: "deployment-time,downscaler/*"
|
||||||
enable_admin_role_for_users: "true"
|
enable_admin_role_for_users: "true"
|
||||||
enable_crd_registration: "true"
|
enable_crd_registration: "true"
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ spec:
|
||||||
type: string
|
type: string
|
||||||
docker_image:
|
docker_image:
|
||||||
type: string
|
type: string
|
||||||
default: "ghcr.io/zalando/spilo-18-dev:ee756c9e"
|
default: "ghcr.io/zalando/spilo-18-dev:6393e80e"
|
||||||
enable_crd_registration:
|
enable_crd_registration:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: true
|
default: true
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ kind: OperatorConfiguration
|
||||||
metadata:
|
metadata:
|
||||||
name: postgresql-operator-default-configuration
|
name: postgresql-operator-default-configuration
|
||||||
configuration:
|
configuration:
|
||||||
docker_image: ghcr.io/zalando/spilo-18-dev:ee756c9e
|
docker_image: ghcr.io/zalando/spilo-18-dev:6393e80e
|
||||||
# enable_crd_registration: true
|
# enable_crd_registration: true
|
||||||
# crd_categories:
|
# crd_categories:
|
||||||
# - all
|
# - all
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
|
||||||
result.EnableTeamIdClusternamePrefix = fromCRD.EnableTeamIdClusternamePrefix
|
result.EnableTeamIdClusternamePrefix = fromCRD.EnableTeamIdClusternamePrefix
|
||||||
result.EtcdHost = fromCRD.EtcdHost
|
result.EtcdHost = fromCRD.EtcdHost
|
||||||
result.KubernetesUseConfigMaps = fromCRD.KubernetesUseConfigMaps
|
result.KubernetesUseConfigMaps = fromCRD.KubernetesUseConfigMaps
|
||||||
result.DockerImage = util.Coalesce(fromCRD.DockerImage, "ghcr.io/zalando/spilo-18-dev:ee756c9e")
|
result.DockerImage = util.Coalesce(fromCRD.DockerImage, "ghcr.io/zalando/spilo-18-dev:6393e80e")
|
||||||
result.Workers = util.CoalesceUInt32(fromCRD.Workers, 8)
|
result.Workers = util.CoalesceUInt32(fromCRD.Workers, 8)
|
||||||
result.MinInstances = fromCRD.MinInstances
|
result.MinInstances = fromCRD.MinInstances
|
||||||
result.MaxInstances = fromCRD.MaxInstances
|
result.MaxInstances = fromCRD.MaxInstances
|
||||||
|
|
|
||||||
|
|
@ -177,7 +177,7 @@ type Config struct {
|
||||||
KubernetesUseConfigMaps bool `name:"kubernetes_use_configmaps" default:"false"`
|
KubernetesUseConfigMaps bool `name:"kubernetes_use_configmaps" default:"false"`
|
||||||
EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS
|
EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS
|
||||||
MaintenanceWindows []string `name:"maintenance_windows"`
|
MaintenanceWindows []string `name:"maintenance_windows"`
|
||||||
DockerImage string `name:"docker_image" default:"ghcr.io/zalando/spilo-18-dev:ee756c9e"`
|
DockerImage string `name:"docker_image" default:"ghcr.io/zalando/spilo-18-dev:6393e80e"`
|
||||||
SidecarImages map[string]string `name:"sidecar_docker_images"` // deprecated in favour of SidecarContainers
|
SidecarImages map[string]string `name:"sidecar_docker_images"` // deprecated in favour of SidecarContainers
|
||||||
SidecarContainers []v1.Container `name:"sidecars"`
|
SidecarContainers []v1.Container `name:"sidecars"`
|
||||||
PodServiceAccountName string `name:"pod_service_account_name" default:"postgres-pod"`
|
PodServiceAccountName string `name:"pod_service_account_name" default:"postgres-pod"`
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue