8000 [backport 628] Rename operator components images to RELATED_IMAGES to support digest pinning by miguelsorianod · Pull Request #640 · 3scale/3scale-operator · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[backport 628] Rename operator components images to RELATED_IMAGES to support digest pinning #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2021
Merged

[backport 628] Rename operator components images to RELATED_IMAGES to support digest pinning #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions bundle/manifests/3scale-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,27 +369,27 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: BACKEND_IMAGE
- name: RELATED_IMAGE_BACKEND
value: quay.io/3scale/apisonator:nightly
- name: APICAST_IMAGE
- name: RELATED_IMAGE_APICAST
value: quay.io/3scale/apicast:nightly
- name: SYSTEM_IMAGE
- name: RELATED_IMAGE_SYSTEM
value: quay.io/3scale/porta:nightly
- name: ZYNC_IMAGE
- name: RELATED_IMAGE_ZYNC
value: quay.io/3scale/zync:nightly
- name: SYSTEM_MEMCACHED_IMAGE
- name: RELATED_IMAGE_SYSTEM_MEMCACHED
value: memcached:1.5
- name: BACKEND_REDIS_IMAGE
- name: RELATED_IMAGE_BACKEND_REDIS
value: centos/redis-5-centos7
- name: SYSTEM_REDIS_IMAGE
- name: RELATED_IMAGE_SYSTEM_REDIS
value: centos/redis-5-centos7
- name: SYSTEM_MYSQL_IMAGE
- name: RELATED_IMAGE_SYSTEM_MYSQL
value: centos/mysql-57-centos7
- name: SYSTEM_POSTGRESQL_IMAGE
- name: RELATED_IMAGE_SYSTEM_POSTGRESQL
value: centos/postgresql-10-centos7
- name: ZYNC_POSTGRESQL_IMAGE
- name: RELATED_IMAGE_ZYNC_POSTGRESQL
value: centos/postgresql-10-centos7
- name: OC_CLI_IMAGE
- name: RELATED_IMAGE_OC_CLI
value: quay.io/openshift/origin-cli:4.2
image: quay.io/3scale/3scale-operator:master
name: manager
Expand Down
22 changes: 11 additions & 11 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,26 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: BACKEND_IMAGE
- name: RELATED_IMAGE_BACKEND
value: "quay.io/3scale/apisonator:nightly"
- name: APICAST_IMAGE
- name: RELATED_IMAGE_APICAST
value: "quay.io/3scale/apicast:nightly"
- name: SYSTEM_IMAGE
- name: RELATED_IMAGE_SYSTEM
value: "quay.io/3scale/porta:nightly"
- name: ZYNC_IMAGE
- name: RELATED_IMAGE_ZYNC
value: "quay.io/3scale/zync:nightly"
- name: SYSTEM_MEMCACHED_IMAGE
- name: RELATED_IMAGE_SYSTEM_MEMCACHED
value: "memcached:1.5"
- name: BACKEND_REDIS_IMAGE
- name: RELATED_IMAGE_BACKEND_REDIS
value: "centos/redis-5-centos7"
- name: SYSTEM_REDIS_IMAGE
- name: RELATED_IMAGE_SYSTEM_REDIS
value: "centos/redis-5-centos7"
- name: SYSTEM_MYSQL_IMAGE
- name: RELATED_IMAGE_SYSTEM_MYSQL
value: "centos/mysql-57-centos7"
- name: SYSTEM_POSTGRESQL_IMAGE
- name: RELATED_IMAGE_SYSTEM_POSTGRESQL
value: "centos/postgresql-10-centos7"
- name: ZYNC_POSTGRESQL_IMAGE
- name: RELATED_IMAGE_ZYNC_POSTGRESQL
value: "centos/postgresql-10-centos7"
- name: OC_CLI_IMAGE
- name: RELATED_IMAGE_OC_CLI
value: "quay.io/openshift/origin-cli:4.2"
terminationGracePeriodSeconds: 10
20 changes: 10 additions & 10 deletions pkg/3scale/amp/operator/images.go
View file
Open in desktop
< 8000 td class="blob-code blob-code-deletion js-file-line"> return helper.GetEnvVar("ZYNC_POSTGRESQL_IMAGE", component.ZyncPostgreSQLImageURL())
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@ import (
)

func ApicastImageURL() string {
return helper.GetEnvVar("APICAST_IMAGE", component.ApicastImageURL())
return helper.GetEnvVar("RELATED_IMAGE_APICAST", component.ApicastImageURL())
}

func BackendImageURL() string {
return helper.GetEnvVar("BACKEND_IMAGE", component.BackendImageURL())
return helper.GetEnvVar("RELATED_IMAGE_BACKEND", component.BackendImageURL())
}

func SystemImageURL() string {
return helper.GetEnvVar("SYSTEM_IMAGE", component.SystemImageURL())
return helper.GetEnvVar("RELATED_IMAGE_SYSTEM", component.SystemImageURL())
}

func ZyncImageURL() string {
return helper.GetEnvVar("ZYNC_IMAGE", component.ZyncImageURL())
return helper.GetEnvVar("RELATED_IMAGE_ZYNC", component.ZyncImageURL())
}

func SystemMemcachedImageURL() string {
return helper.GetEnvVar("SYSTEM_MEMCACHED_IMAGE", component.SystemMemcachedImageURL())
return helper.GetEnvVar("RELATED_IMAGE_SYSTEM_MEMCACHED", component.SystemMemcachedImageURL())
}

func BackendRedisImageURL() string {
return helper.GetEnvVar("BACKEND_REDIS_IMAGE", component.BackendRedisImageURL())
return helper.GetEnvVar("RELATED_IMAGE_BACKEND_REDIS", component.BackendRedisImageURL())
}

func SystemRedisImageURL() string {
return helper.GetEnvVar("SYSTEM_REDIS_IMAGE", component.SystemRedisImageURL())
return helper.GetEnvVar("RELATED_IMAGE_SYSTEM_REDIS", component.SystemRedisImageURL())
}

func SystemMySQLImageURL() string {
return helper.GetEnvVar("SYSTEM_MYSQL_IMAGE", component.SystemMySQLImageURL())
return helper.GetEnvVar("RELATED_IMAGE_SYSTEM_MYSQL", component.SystemMySQLImageURL())
}

func SystemPostgreSQLImageURL() string {
return helper.GetEnvVar("SYSTEM_POSTGRESQL_IMAGE", component.SystemPostgreSQLImageURL())
return helper.GetEnvVar("RELATED_IMAGE_SYSTEM_POSTGRESQL", component.SystemPostgreSQLImageURL())
}

func ZyncPostgreSQLImageURL() string {
return helper.GetEnvVar("RELATED_IMAGE_ZYNC_POSTGRESQL", component.ZyncPostgreSQLImageURL())
}
18 changes: 9 additions & 9 deletions pkg/3scale/amp/operator/images_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ func TestImageURLFromEnv(t *testing.T) {
envVarName string
imageURL func() string
}{
{"ApicastURL", "APICAST_IMAGE", func() string { return ApicastImageURL() }},
{"BackendURL", "BACKEND_IMAGE", func() string { return BackendImageURL() }},
{"SystemURL", "SYSTEM_IMAGE", func() string { return SystemImageURL() }},
{"ZyncURL", "ZYNC_IMAGE", func() string { return ZyncImageURL() }},
{"SystemMemcachedURL", "SYSTEM_MEMCACHED_IMAGE", func() string { return SystemMemcachedImageURL() }},
{"SystemRedisImageURL", "SYSTEM_REDIS_IMAGE", func() string { return SystemRedisImageURL() }},
{"SystemMySQLImageURL", "SYSTEM_MYSQL_IMAGE", func() string { return SystemMySQLImageURL() }},
{"SystemPostgreSQLImageURL", "SYSTEM_POSTGRESQL_IMAGE", func() string { return SystemPostgreSQLImageURL() }},
{"ZyncPostgreSQLImageURL", "ZYNC_POSTGRESQL_IMAGE", func() string { return ZyncPostgreSQLImageURL() }},
{"ApicastURL", "RELATED_IMAGE_APICAST", func() string { return ApicastImageURL() }},
{"BackendURL", "RELATED_IMAGE_BACKEND", func() string { return BackendImageURL() }},
{"SystemURL", "RELATED_IMAGE_SYSTEM", func() string { return SystemImageURL() }},
{"ZyncURL", "RELATED_IMAGE_ZYNC", func() string { return ZyncImageURL() }},
{"SystemMemcachedURL", "RELATED_IMAGE_SYSTEM_MEMCACHED", func() string { return SystemMemcachedImageURL() }},
{"SystemRedisImageURL", "RELATED_IMAGE_SYSTEM_REDIS", func() string { return SystemRedisImageURL() }},
{"SystemMySQLImageURL", "RELATED_IMAGE_SYSTEM_MYSQL", func() string { return SystemMySQLImageURL() }},
{"SystemPostgreSQLImageURL", "RELATED_IMAGE_SYSTEM_POSTGRESQL", func() string { return SystemPostgreSQLImageURL() }},
{"ZyncPostgreSQLImageURL", "RELATED_IMAGE_ZYNC_POSTGRESQL", func() string { return ZyncPostgreSQLImageURL() }},
}

for _, tc := range cases {
Expand Down
2 changes: 1 addition & 1 deletion pkg/restore/apimanager_restore_options_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ func (a *APIManagerRestoreOptionsProvider) pvcRestoreOptions() (*APIManagerResto
}

func (a *APIManagerRestoreOptionsProvider) ocCLIImageURL() string {
return helper.GetEnvVar("OC_CLI_IMAGE", component.OCCLIImageURL())
return helper.GetEnvVar("RELATED_IMAGE_OC_CLI", component.OCCLIImageURL())
}
0