Skip to content

Commit 1b08ee1

Browse files
FxKuFxKu
authored
switch to ghcr image in helm chart and examples (zalando#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
1 parent 843d3e1 commit 1b08ee1

File tree

13 files changed

+16
-16
lines changed

13 files changed

+16
-16
lines changed

‎.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ assignees: ''
99

1010
Please, answer some short questions which should help us to understand your problem / question better?
1111

12-
- **Which image of the operator are you using?** e.g. registry.opensource.zalan.do/acid/postgres-operator:v1.11.0
12+
- **Which image of the operator are you using?** e.g. ghcr.io/zalando/postgres-operator:v1.11.0
1313
- **Where do you run it - cloud or metal? Kubernetes or OpenShift?** [AWS K8s | GCP ... | Bare Metal K8s]
1414
- **Are you running Postgres Operator in production?** [yes | no]
1515
- **Type of issue?** [Bug report, question, feature request, etc.]

‎charts/postgres-operator-ui/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ replicaCount: 1
66

77
# configure ui image
88
image:
9-
registry: registry.opensource.zalan.do
10-
repository: acid/postgres-operator-ui
9+
registry: ghcr.io
10+
repository: zalando/postgres-operator-ui
1111
tag: v1.11.0
1212
pullPolicy: "IfNotPresent"
1313

‎charts/postgres-operator/crds/operatorconfigurations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ spec:
508508
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
509509
logical_backup_docker_image:
510510
type: string
511-
default: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
511+
default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
512512
logical_backup_google_application_credentials:
513513
type: string
514514
logical_backup_job_prefix:

‎charts/postgres-operator/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
image:
2-
registry: registry.opensource.zalan.do
3-
repository: acid/postgres-operator
2+
registry: ghcr.io
3+
repository: zalando/postgres-operator
44
tag: v1.11.0
55
pullPolicy: "IfNotPresent"
66

@@ -362,7 +362,7 @@ configLogicalBackup:
362362
# logical_backup_memory_request: ""
363363

364364
# image for pods of the logical backup job (example runs pg_dumpall)
365-
logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
365+
logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
366366
# path of google cloud service account json file
367367
# logical_backup_google_application_credentials: ""
368368

‎docs/administrator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ make docker
13991399
14001400
# build in image in minikube docker env
14011401
eval $(minikube docker-env)
1402-
docker build -t registry.opensource.zalan.do/acid/postgres-operator-ui:v1.8.1 .
1402+
docker build -t ghcr.io/zalando/postgres-operator-ui:v1.11.0 .
14031403
14041404
# apply UI manifests next to a running Postgres Operator
14051405
kubectl apply -f manifests/

‎docs/reference/operator_parameters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ grouped under the `logical_backup` key.
821821
runs `pg_dumpall` on a replica if possible and uploads compressed results to
822822
an S3 bucket under the key `/<configured-s3-bucket-prefix>/<pg_cluster_name>/<cluster_k8s_uuid>/logical_backups`.
823823
The default image is the same image built with the Zalando-internal CI
824-
pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
824+
pipeline. Default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
825825

826826
* **logical_backup_google_application_credentials**
827827
Specifies the path of the google cloud service account json file. Default is empty.

‎manifests/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ data:
8383
# logical_backup_azure_storage_account_key: ""
8484
# logical_backup_cpu_limit: ""
8585
# logical_backup_cpu_request: ""
86-
logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
86+
logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
8787
# logical_backup_google_application_credentials: ""
8888
logical_backup_job_prefix: "logical-backup-"
8989
# logical_backup_memory_limit: ""

‎manifests/operatorconfiguration.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ spec:
506506
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
507507
logical_backup_docker_image:
508508
type: string
509-
default: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
509+
default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
510510
logical_backup_google_application_credentials:
511511
type: string
512512
logical_backup_job_prefix:

‎manifests/postgres-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
serviceAccountName: postgres-operator
2020
containers:
2121
- name: postgres-operator
22-
image: registry.opensource.zalan.do/acid/postgres-operator:v1.11.0
22+
image: ghcr.io/zalando/postgres-operator:v1.11.0
2323
imagePullPolicy: IfNotPresent
2424
resources:
2525
requests:

‎manifests/postgresql-operator-default-configuration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ configuration:
167167
# logical_backup_cpu_request: ""
168168
# logical_backup_memory_limit: ""
169169
# logical_backup_memory_request: ""
170-
logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
170+
logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"
171171
# logical_backup_google_application_credentials: ""
172172
logical_backup_job_prefix: "logical-backup-"
173173
logical_backup_provider: "s3"

‎pkg/controller/operator_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
179179

180180
// logical backup config
181181
result.LogicalBackupSchedule = util.Coalesce(fromCRD.LogicalBackup.Schedule, "30 00 * * *")
182-
result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "registry.opensource.zalan.do/acid/logical-backup:v1.11.0")
182+
result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0")
183183
result.LogicalBackupProvider = util.Coalesce(fromCRD.LogicalBackup.BackupProvider, "s3")
184184
result.LogicalBackupAzureStorageAccountName = fromCRD.LogicalBackup.AzureStorageAccountName
185185
result.LogicalBackupAzureStorageAccountKey = fromCRD.LogicalBackup.AzureStorageAccountKey

‎pkg/util/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ type Scalyr struct {
126126
// LogicalBackup defines configuration for logical backup
127127
type LogicalBackup struct {
128128
LogicalBackupSchedule string `name:"logical_backup_schedule" default:"30 00 * * *"`
129-
LogicalBackupDockerImage string `name:"logical_backup_docker_image" default:"registry.opensource.zalan.do/acid/logical-backup:v1.11.0"`
129+
LogicalBackupDockerImage string `name:"logical_backup_docker_image" default:"ghcr.io/zalando/postgres-operator/logical-backup:v1.11.0"`
130130
LogicalBackupProvider string `name:"logical_backup_provider" default:"s3"`
131131
LogicalBackupAzureStorageAccountName string `name:"logical_backup_azure_storage_account_name" default:""`
132132
LogicalBackupAzureStorageContainer string `name:"logical_backup_azure_storage_container" default:""`

‎ui/manifests/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
serviceAccountName: postgres-operator-ui
1919
containers:
2020
- name: "service"
21-
image: registry.opensource.zalan.do/acid/postgres-operator-ui:v1.11.0
21+
image: ghcr.io/zalando/postgres-operator-ui:v1.11.0
2222
ports:
2323
- containerPort: 8081
2424
protocol: "TCP"

0 commit comments

Comments
 (0)