From 7572b31fc294d5e502087cf4bfcfb1f76faed8ea Mon Sep 17 00:00:00 2001 From: nickboldt Date: Wed, 15 May 2019 13:55:03 -0400 Subject: [PATCH] CRW-280 use registry.redhat.io (authenticated) instead of registry.access.redhat.com (non-auth'd); also new server image is registry.redhat.io/codeready-workspaces/server-rhel8, not just /server Change-Id: I247e6db78cc71d53e385e5ef830234580b3b34bd Signed-off-by: nickboldt --- README.md | 2 +- deploy/crds/org_v1_che_cr.yaml | 2 +- pkg/apis/org/v1/che_types.go | 2 +- pkg/deploy/defaults.go | 2 +- vendor/github.com/openshift/api/image/v1/types.go | 2 +- .../openshift/api/image/v1/types_swagger_doc_generated.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e42214bd8..9291775e9 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ OOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o $GOPATH/src/github.com/eclipse/ Or you can build in a container: ``` -docker run -ti -v /tmp:/tmp -v ${OPERATOR_REPO}:/opt/app-root/src/go/src/github.com/eclipse/che-operator registry.access.redhat.com/devtools/go-toolset-rhel7:1.11.5-3 sh -c "OOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /tmp/run-tests /opt/app-root/src/go/src/github.com/eclipse/che-operator/e2e/*.go" +docker run -ti -v /tmp:/tmp -v ${OPERATOR_REPO}:/opt/app-root/src/go/src/github.com/eclipse/che-operator registry.redhat.io/devtools/go-toolset-rhel7:1.11.5-3 sh -c "OOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /tmp/run-tests /opt/app-root/src/go/src/github.com/eclipse/che-operator/e2e/*.go" cp /tmp/run-tests ${OPERATOR_REPO}/run-tests ``` diff --git a/deploy/crds/org_v1_che_cr.yaml b/deploy/crds/org_v1_che_cr.yaml index cdb8d0548..b2708eb34 100644 --- a/deploy/crds/org_v1_che_cr.yaml +++ b/deploy/crds/org_v1_che_cr.yaml @@ -58,7 +58,7 @@ spec: chePostgresPassword: '' # Postgres database name that Che server uses to connect to. Defaults to dbche chePostgresDb: '' - # Postgres deployment in format image:tag. Defaults to registry.access.redhat.com/rhscl/postgresql-96-rhel7 (see pkg/deploy/defaults.go for latest tag) + # Postgres deployment in format image:tag. Defaults to registry.redhat.io/rhscl/postgresql-96-rhel7 (see pkg/deploy/defaults.go for latest tag) postgresImage: '' storage: # persistent volume claim strategy for Che server. Can be common (all workspaces PVCs in one volume), diff --git a/pkg/apis/org/v1/che_types.go b/pkg/apis/org/v1/che_types.go index 16d45ccf7..bc5c4dcc4 100644 --- a/pkg/apis/org/v1/che_types.go +++ b/pkg/apis/org/v1/che_types.go @@ -81,7 +81,7 @@ type CheClusterSpecDB struct { ChePostgresPassword string `json:"chePostgresPassword"` // ChePostgresDb is Postgres database name that Che server uses to connect to. Defaults to dbche ChePostgresDb string `json:"chePostgresDb"` - // PostgresImage is an image used in Postgres deployment in format image:tag. Defaults to registry.access.redhat.com/rhscl/postgresql-96-rhel7 (see pkg/deploy/defaults.go for latest tag) + // PostgresImage is an image used in Postgres deployment in format image:tag. Defaults to registry.redhat.io/rhscl/postgresql-96-rhel7 (see pkg/deploy/defaults.go for latest tag) PostgresImage string `json:"postgresImage"` } diff --git a/pkg/deploy/defaults.go b/pkg/deploy/defaults.go index 8f16673fa..eae703878 100644 --- a/pkg/deploy/defaults.go +++ b/pkg/deploy/defaults.go @@ -14,7 +14,7 @@ package deploy const ( DefaultCheServerImageRepo = "eclipse/che-server" - DefaultCodeReadyServerImageRepo = "registry.access.redhat.com/codeready-workspaces/server" + DefaultCodeReadyServerImageRepo = "registry.redhat.io/codeready-workspaces/server-rhel8" DefaultCheServerImageTag = "7.0.0-beta-4.0" DefaultCodeReadyServerImageTag = "1.2" DefaultCheFlavor = "che" diff --git a/vendor/github.com/openshift/api/image/v1/types.go b/vendor/github.com/openshift/api/image/v1/types.go index 2390f131d..3f5d9f5eb 100644 --- a/vendor/github.com/openshift/api/image/v1/types.go +++ b/vendor/github.com/openshift/api/image/v1/types.go @@ -89,7 +89,7 @@ type ImageSignature struct { // the information available. // A human readable string representing image's identity. It could be a product name and version, or an - // image pull spec (e.g. "registry.access.redhat.com/rhel7/rhel:7.2"). + // image pull spec (e.g. "registry.redhat.io/rhel7/rhel:7.2"). ImageIdentity string `json:"imageIdentity,omitempty" protobuf:"bytes,5,opt,name=imageIdentity"` // Contains claims from the signature. SignedClaims map[string]string `json:"signedClaims,omitempty" protobuf:"bytes,6,rep,name=signedClaims"` diff --git a/vendor/github.com/openshift/api/image/v1/types_swagger_doc_generated.go b/vendor/github.com/openshift/api/image/v1/types_swagger_doc_generated.go index 43f9d8951..80699eccb 100644 --- a/vendor/github.com/openshift/api/image/v1/types_swagger_doc_generated.go +++ b/vendor/github.com/openshift/api/image/v1/types_swagger_doc_generated.go @@ -102,7 +102,7 @@ var map_ImageSignature = map[string]string{ "type": "Required: Describes a type of stored blob.", "content": "Required: An opaque binary string which is an image's signature.", "conditions": "Conditions represent the latest available observations of a signature's current state.", - "imageIdentity": "A human readable string representing image's identity. It could be a product name and version, or an image pull spec (e.g. \"registry.access.redhat.com/rhel7/rhel:7.2\").", + "imageIdentity": "A human readable string representing image's identity. It could be a product name and version, or an image pull spec (e.g. \"registry.redhat.io/rhel7/rhel:7.2\").", "signedClaims": "Contains claims from the signature.", "created": "If specified, it is the time of signature's creation.", "issuedBy": "If specified, it holds information about an issuer of signing certificate or key (a person or entity who signed the signing certificate or key).",