switch to ghcr image in helm chart and examples (#2634)
* switch to ghcr image in helm chart and examples * change logical backup config for helm chart * change internal default for logical backup image config to ghcr, too
This commit is contained in:
parent
843d3e1caa
commit
1b08ee1acf
|
|
@ -9,7 +9,7 @@ assignees: ''
|
||||||
|
|
||||||
Please, answer some short questions which should help us to understand your problem / question better?
|
Please, answer some short questions which should help us to understand your problem / question better?
|
||||||
|
|
||||||
- **Which image of the operator are you using?** e.g. registry.opensource.zalan.do/acid/postgres-operator:v1.11.0
|
- **Which image of the operator are you using?** e.g. ghcr.io/zalando/postgres-operator:v1.11.0
|
||||||
- **Where do you run it - cloud or metal? Kubernetes or OpenShift?** [AWS K8s | GCP ... | Bare Metal K8s]
|
- **Where do you run it - cloud or metal? Kubernetes or OpenShift?** [AWS K8s | GCP ... | Bare Metal K8s]
|
||||||
- **Are you running Postgres Operator in production?** [yes | no]
|
- **Are you running Postgres Operator in production?** [yes | no]
|
||||||
- **Type of issue?** [Bug report, question, feature request, etc.]
|
- **Type of issue?** [Bug report, question, feature request, etc.]
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,8 @@ replicaCount: 1
|
||||||
|
|
||||||
# configure ui image
|
# configure ui image
|
||||||
image:
|
image:
|
||||||
registry: registry.opensource.zalan.do
|
registry: ghcr.io
|
||||||
repository: acid/postgres-operator-ui
|
repository: zalando/postgres-operator-ui
|
||||||
tag: v1.11.0
|
tag: v1.11.0
|
||||||
pullPolicy: "IfNotPresent"
|
pullPolicy: "IfNotPresent"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -508,7 +508,7 @@ spec:
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
||||||
logical_backup_docker_image:
|
logical_backup_docker_image:
|
||||||
type: string
|
type: string
|
||||||
default: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
|
default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
|
||||||
logical_backup_google_application_credentials:
|
logical_backup_google_application_credentials:
|
||||||
type: string
|
type: string
|
||||||
logical_backup_job_prefix:
|
logical_backup_job_prefix:
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
image:
|
image:
|
||||||
registry: registry.opensource.zalan.do
|
registry: ghcr.io
|
||||||
repository: acid/postgres-operator
|
repository: zalando/postgres-operator
|
||||||
tag: v1.11.0
|
tag: v1.11.0
|
||||||
pullPolicy: "IfNotPresent"
|
pullPolicy: "IfNotPresent"
|
||||||
|
|
||||||
|
|
@ -362,7 +362,7 @@ configLogicalBackup:
|
||||||
# logical_backup_memory_request: ""
|
# logical_backup_memory_request: ""
|
||||||
|
|
||||||
# image for pods of the logical backup job (example runs pg_dumpall)
|
# image for pods of the logical backup job (example runs pg_dumpall)
|
||||||
logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
|
logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
|
||||||
# path of google cloud service account json file
|
# path of google cloud service account json file
|
||||||
# logical_backup_google_application_credentials: ""
|
# logical_backup_google_application_credentials: ""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1399,7 +1399,7 @@ make docker
|
||||||
|
|
||||||
# build in image in minikube docker env
|
# build in image in minikube docker env
|
||||||
eval $(minikube docker-env)
|
eval $(minikube docker-env)
|
||||||
docker build -t registry.opensource.zalan.do/acid/postgres-operator-ui:v1.8.1 .
|
docker build -t ghcr.io/zalando/postgres-operator-ui:v1.11.0 .
|
||||||
|
|
||||||
# apply UI manifests next to a running Postgres Operator
|
# apply UI manifests next to a running Postgres Operator
|
||||||
kubectl apply -f manifests/
|
kubectl apply -f manifests/
|
||||||
|
|
|
||||||
|
|
@ -821,7 +821,7 @@ grouped under the `logical_backup` key.
|
||||||
runs `pg_dumpall` on a replica if possible and uploads compressed results to
|
runs `pg_dumpall` on a replica if possible and uploads compressed results to
|
||||||
an S3 bucket under the key `/<configured-s3-bucket-prefix>/<pg_cluster_name>/<cluster_k8s_uuid>/logical_backups`.
|
an S3 bucket under the key `/<configured-s3-bucket-prefix>/<pg_cluster_name>/<cluster_k8s_uuid>/logical_backups`.
|
||||||
The default image is the same image built with the Zalando-internal CI
|
The default image is the same image built with the Zalando-internal CI
|
||||||
pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
|
pipeline. Default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
|
||||||
|
|
||||||
* **logical_backup_google_application_credentials**
|
* **logical_backup_google_application_credentials**
|
||||||
Specifies the path of the google cloud service account json file. Default is empty.
|
Specifies the path of the google cloud service account json file. Default is empty.
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ data:
|
||||||
# logical_backup_azure_storage_account_key: ""
|
# logical_backup_azure_storage_account_key: ""
|
||||||
# logical_backup_cpu_limit: ""
|
# logical_backup_cpu_limit: ""
|
||||||
# logical_backup_cpu_request: ""
|
# logical_backup_cpu_request: ""
|
||||||
logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
|
logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
|
||||||
# logical_backup_google_application_credentials: ""
|
# logical_backup_google_application_credentials: ""
|
||||||
logical_backup_job_prefix: "logical-backup-"
|
logical_backup_job_prefix: "logical-backup-"
|
||||||
# logical_backup_memory_limit: ""
|
# logical_backup_memory_limit: ""
|
||||||
|
|
|
||||||
|
|
@ -506,7 +506,7 @@ spec:
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
||||||
logical_backup_docker_image:
|
logical_backup_docker_image:
|
||||||
type: string
|
type: string
|
||||||
default: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
|
default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
|
||||||
logical_backup_google_application_credentials:
|
logical_backup_google_application_credentials:
|
||||||
type: string
|
type: string
|
||||||
logical_backup_job_prefix:
|
logical_backup_job_prefix:
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ spec:
|
||||||
serviceAccountName: postgres-operator
|
serviceAccountName: postgres-operator
|
||||||
containers:
|
containers:
|
||||||
- name: postgres-operator
|
- name: postgres-operator
|
||||||
image: registry.opensource.zalan.do/acid/postgres-operator:v1.11.0
|
image: ghcr.io/zalando/postgres-operator:v1.11.0
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
|
|
|
||||||
|
|
@ -167,7 +167,7 @@ configuration:
|
||||||
# logical_backup_cpu_request: ""
|
# logical_backup_cpu_request: ""
|
||||||
# logical_backup_memory_limit: ""
|
# logical_backup_memory_limit: ""
|
||||||
# logical_backup_memory_request: ""
|
# logical_backup_memory_request: ""
|
||||||
logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
|
logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
|
||||||
# logical_backup_google_application_credentials: ""
|
# logical_backup_google_application_credentials: ""
|
||||||
logical_backup_job_prefix: "logical-backup-"
|
logical_backup_job_prefix: "logical-backup-"
|
||||||
logical_backup_provider: "s3"
|
logical_backup_provider: "s3"
|
||||||
|
|
|
||||||
|
|
@ -179,7 +179,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
|
||||||
|
|
||||||
// logical backup config
|
// logical backup config
|
||||||
result.LogicalBackupSchedule = util.Coalesce(fromCRD.LogicalBackup.Schedule, "30 00 * * *")
|
result.LogicalBackupSchedule = util.Coalesce(fromCRD.LogicalBackup.Schedule, "30 00 * * *")
|
||||||
result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "registry.opensource.zalan.do/acid/logical-backup:v1.11.0")
|
result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0")
|
||||||
result.LogicalBackupProvider = util.Coalesce(fromCRD.LogicalBackup.BackupProvider, "s3")
|
result.LogicalBackupProvider = util.Coalesce(fromCRD.LogicalBackup.BackupProvider, "s3")
|
||||||
result.LogicalBackupAzureStorageAccountName = fromCRD.LogicalBackup.AzureStorageAccountName
|
result.LogicalBackupAzureStorageAccountName = fromCRD.LogicalBackup.AzureStorageAccountName
|
||||||
result.LogicalBackupAzureStorageAccountKey = fromCRD.LogicalBackup.AzureStorageAccountKey
|
result.LogicalBackupAzureStorageAccountKey = fromCRD.LogicalBackup.AzureStorageAccountKey
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,7 @@ type Scalyr struct {
|
||||||
// LogicalBackup defines configuration for logical backup
|
// LogicalBackup defines configuration for logical backup
|
||||||
type LogicalBackup struct {
|
type LogicalBackup struct {
|
||||||
LogicalBackupSchedule string `name:"logical_backup_schedule" default:"30 00 * * *"`
|
LogicalBackupSchedule string `name:"logical_backup_schedule" default:"30 00 * * *"`
|
||||||
LogicalBackupDockerImage string `name:"logical_backup_docker_image" default:"registry.opensource.zalan.do/acid/logical-backup:v1.11.0"`
|
LogicalBackupDockerImage string `name:"logical_backup_docker_image" default:"ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"`
|
||||||
LogicalBackupProvider string `name:"logical_backup_provider" default:"s3"`
|
LogicalBackupProvider string `name:"logical_backup_provider" default:"s3"`
|
||||||
LogicalBackupAzureStorageAccountName string `name:"logical_backup_azure_storage_account_name" default:""`
|
LogicalBackupAzureStorageAccountName string `name:"logical_backup_azure_storage_account_name" default:""`
|
||||||
LogicalBackupAzureStorageContainer string `name:"logical_backup_azure_storage_container" default:""`
|
LogicalBackupAzureStorageContainer string `name:"logical_backup_azure_storage_container" default:""`
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ spec:
|
||||||
serviceAccountName: postgres-operator-ui
|
serviceAccountName: postgres-operator-ui
|
||||||
containers:
|
containers:
|
||||||
- name: "service"
|
- name: "service"
|
||||||
image: registry.opensource.zalan.do/acid/postgres-operator-ui:v1.11.0
|
image: ghcr.io/zalando/postgres-operator-ui:v1.11.0
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8081
|
- containerPort: 8081
|
||||||
protocol: "TCP"
|
protocol: "TCP"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue