diff --git a/pkg/model/image_manager.go b/pkg/model/image_manager.go index c0a0d1e94..37dcade70 100644 --- a/pkg/model/image_manager.go +++ b/pkg/model/image_manager.go @@ -16,10 +16,10 @@ const ( PostgresqlImage = "RELATED_IMAGE_POSTGRESQL" DefaultKeycloakImage = "quay.io/keycloak/keycloak:latest" - DefaultRHSSOImageOpenJ9 = "registry.redhat.io/rh-sso-7/sso74-openj9-openshift-rhel8:7.4" - DefaultRHSSOImageOpenJDK = "registry.redhat.io/rh-sso-7/sso74-openshift-rhel8:7.4" + DefaultRHSSOImageOpenJ9 = "registry.redhat.io/rh-sso-7/sso75-openj9-openshift-rhel8:7.5" + DefaultRHSSOImageOpenJDK = "registry.redhat.io/rh-sso-7/sso75-openshift-rhel8:7.5" DefaultKeycloakInitContainer = "quay.io/keycloak/keycloak-init-container:master" - DefaultRHSSOInitContainer = "registry.redhat.io/rh-sso-7-tech-preview/sso74-init-container-rhel8:7.4" + DefaultRHSSOInitContainer = "registry.redhat.io/rh-sso-7/sso7-rhel8-init-container:7.5" DefaultRHMIBackupContainer = "quay.io/integreatly/backup-container:1.0.16" DefaultPostgresqlImage = "registry.access.redhat.com/rhscl/postgresql-10-rhel7:1" ) diff --git a/productize.sh b/productize.sh index c1264f830..c8352820b 100755 --- a/productize.sh +++ b/productize.sh @@ -2,14 +2,14 @@ LABELS=$(cat <<-END LABEL \ -com.redhat.component="redhat-sso-7-sso74-rhel8-tech-preview-operator-container" \ -description="Red Hat Single Sign-On 7.4 Operator container image, based on the Red Hat Universal Base Image 8 Minimal container image" \ -summary="Red Hat Single Sign-On 7.4 Operator container image, based on the Red Hat Universal Base Image 8 Minimal container image" \ -version="7.4" \ +com.redhat.component="redhat-sso-7-rhel8-operator-container" \ +description="Red Hat Single Sign-On 7. Operator container image, based on the Red Hat Universal Base Image 8 Minimal container image" \ +summary="Red Hat Single Sign-On 7.5 Operator container image, based on the Red Hat Universal Base Image 8 Minimal container image" \ +version="7.5" \ io.k8s.description="Operator for Red Hat SSO" \ -io.k8s.display-name="Red Hat SSO 7.4 Operator" \ -io.openshift.tags="sso,sso74,keycloak,operator" \ -name="rh-sso-7-tech-preview\/sso74-rhel8-operator" \ +io.k8s.display-name="Red Hat SSO 7.5 Operator" \ +io.openshift.tags="sso,sso75,keycloak,operator" \ +name="rh-sso-7\/sso7-rhel8-operator" \ maintainer="Red Hat Single Sign-On Team" END ) @@ -21,10 +21,3 @@ sed -i \ -e 's,RUN cd /src ,RUN cd /src \&\& tar -x --strip-components=1 -f keycloak-operator-*.tar.gz ,' \ -e "s/##LABELS/$LABELS/g" \ Dockerfile - -if [[ "$BUILD_OPENJ9" != "true" ]] -then - # remove s390x arch from container.yaml - # upstream repo should always contain all archs - sed -i -e '/\-\ s390x/ s/^#*/#/' container.yaml -fi \ No newline at end of file