Skip to content
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

Jump to bottom

fix: CRW-2303 - re-enable RELATED_IMAGE_gateway_authentication_sidecar and RELATED_IMAGE_gateway_authorization_sidecar #113

Merged
merged 1 commit into from
Sep 29, 2021
Merged

fix: CRW-2303 - re-enable RELATED_IMAGE_gateway_authentication_sidecar and RELATED_IMAGE_gateway_authorization_sidecar #113

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
11 changes: 9 additions & 2 deletions codeready-workspaces-operator-bundle/build/scripts/sync-che-olm-to-crw-olm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ DWO_TAG=0.9
SSO_TAG=7.4
UBI_TAG=8.4
POSTGRES_TAG=1
OPENSHIFT_TAG="v4.8"

command -v yq >/dev/null 2>&1 || { echo "yq is not installed. Aborting."; exit 1; }
command -v skopeo >/dev/null 2>&1 || { echo "skopeo is not installed. Aborting."; exit 1; }
Expand All @@ -51,6 +52,7 @@ usage () {
--sso-tag ${SSO_TAG}
--ubi-tag ${UBI_TAG}
--postgres-tag ${POSTGRES_TAG}
--openshift-tag ${OPENSHIFT_TAG}
"
exit
}
Expand All @@ -75,6 +77,7 @@ while [[ "$#" -gt 0 ]]; do
'--sso-tag') SSO_TAG="$2"; shift 1;;
'--ubi-tag') UBI_TAG="$2"; shift 1;;
'--postgres-tag') POSTGRES_TAG="$2"; shift 1;;
'--openshift-tag') OPENSHIFT_TAG="$2"; shift 1;;
esac
shift 1
done
Expand Down Expand Up @@ -112,6 +115,8 @@ CRW_BACKUP_IMAGE="${CRW_RRIO}/backup-rhel8:${CRW_VERSION}"
UBI_IMAGE="registry.redhat.io/ubi8/ubi-minimal:${UBI_TAG}"
POSTGRES_IMAGE="registry.redhat.io/rhel8/postgresql-96:${POSTGRES_TAG}"
SSO_IMAGE="registry.redhat.io/rh-sso-7/sso74-openshift-rhel8:${SSO_TAG}" # and registry.redhat.io/rh-sso-7/sso74-openj9-openshift-rhel8 too
RBAC_PROXY_IMAGE="registry.redhat.io/openshift4/ose-kube-rbac-proxy:${OPENSHIFT_TAG}"
OAUTH_PROXY_IMAGE="registry.redhat.io/openshift4/ose-oauth-proxy:${OPENSHIFT_TAG}"

# header to reattach to yaml files after yq transform removes it
COPYRIGHT="#
Expand Down Expand Up @@ -302,10 +307,12 @@ for CSVFILE in ${TARGETDIR}/manifests/codeready-workspaces.csv.yaml; do
["RELATED_IMAGE_postgres"]="${POSTGRES_IMAGE}"
["RELATED_IMAGE_keycloak"]="${SSO_IMAGE}"

# CRW-2303 - @since 2.12 DWO only
["RELATED_IMAGE_gateway_authentication_sidecar"]="${OAUTH_PROXY_IMAGE}"
["RELATED_IMAGE_gateway_authorization_sidecar"]="${RBAC_PROXY_IMAGE}"

# remove env vars using DELETEME keyword
["RELATED_IMAGE_che_tls_secrets_creation_job"]="DELETEME"
["RELATED_IMAGE_gateway_authentication_sidecar"]="DELETEME"
["RELATED_IMAGE_gateway_authorization_sidecar"]="DELETEME"
["RELATED_IMAGE_gateway_header_sidecar"]="DELETEME"
)
for updateName in "${!operator_replacements[@]}"; do
Expand Down
15 changes: 9 additions & 6 deletions codeready-workspaces-operator-bundle/build/scripts/sync-che-operator-to-crw-operator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ DWO_TAG=0.9
SSO_TAG=7.4
UBI_TAG=8.4
POSTGRES_TAG=1
OPENSHIFT_TAG="v4.8"

usage () {
echo "Usage: ${0##*/} -v [CRW CSV_VERSION] [-s /path/to/sources] [-t /path/to/generated]"
Expand All @@ -31,6 +32,7 @@ usage () {
--sso-tag ${SSO_TAG}
--ubi-tag ${UBI_TAG}
--postgres-tag ${POSTGRES_TAG}
--openshift-tag ${OPENSHIFT_TAG}
"
exit
}
Expand All @@ -51,6 +53,7 @@ while [[ "$#" -gt 0 ]]; do
'--sso-tag') SSO_TAG="$2"; shift 1;;
'--ubi-tag') UBI_TAG="$2"; shift 1;;
'--postgres-tag') POSTGRES_TAG="$2"; shift 1;;
'--openshift-tag') OPENSHIFT_TAG="$2"; shift 1;;
esac
shift 1
done
Expand Down Expand Up @@ -82,6 +85,8 @@ CRW_BACKUP_IMAGE="${CRW_RRIO}/backup-rhel8:${CRW_VERSION}"
UBI_IMAGE="registry.redhat.io/ubi8/ubi-minimal:${UBI_TAG}"
POSTGRES_IMAGE="registry.redhat.io/rhel8/postgresql-96:${POSTGRES_TAG}"
SSO_IMAGE="registry.redhat.io/rh-sso-7/sso74-openshift-rhel8:${SSO_TAG}" # and registry.redhat.io/rh-sso-7/sso74-openj9-openshift-rhel8 too
RBAC_PROXY_IMAGE="registry.redhat.io/openshift4/ose-kube-rbac-proxy:${OPENSHIFT_TAG}"
OAUTH_PROXY_IMAGE="registry.redhat.io/openshift4/ose-oauth-proxy:${OPENSHIFT_TAG}"

# global / generic changes
pushd "${SOURCEDIR}" >/dev/null
Expand Down Expand Up @@ -221,10 +226,12 @@ declare -A operator_replacements=(
["RELATED_IMAGE_postgres"]="${POSTGRES_IMAGE}"
["RELATED_IMAGE_keycloak"]="${SSO_IMAGE}"

# CRW-2303 - @since 2.12 DWO only
["RELATED_IMAGE_gateway_authentication_sidecar"]="${OAUTH_PROXY_IMAGE}"
["RELATED_IMAGE_gateway_authorization_sidecar"]="${RBAC_PROXY_IMAGE}"

# remove env vars using DELETEME keyword
["RELATED_IMAGE_che_tls_secrets_creation_job"]="DELETEME"
["RELATED_IMAGE_gateway_authentication_sidecar"]="DELETEME"
["RELATED_IMAGE_gateway_authorization_sidecar"]="DELETEME"
["RELATED_IMAGE_gateway_header_sidecar"]="DELETEME"
)

Expand Down Expand Up @@ -305,16 +312,12 @@ sed -i "${TARGETDIR}/pkg/deploy/defaults.go" -r \
-e 's|(\t)(defaultCheTLSSecretsCreationJobImage = getDefaultFromEnv\(util.GetArchitectureDependentEnv\("RELATED_IMAGE_che_tls_secrets_creation_job"\)\))|\1// \2|' \
-e 's|(\t)(defaultInternalRestBackupServerImage = getDefaultFromEnv\(util.GetArchitectureDependentEnv\("RELATED_IMAGE_internal_rest_backup_server"\)\))|\1// \2|' \
-e 's|(\t)(defaultInternalRestBackupServerImage = getDefaultFromEnv\(util.GetArchitectureDependentEnv\("RELATED_IMAGE_single_host_gateway_native_user_mode"\)\))|\1// \2|' \
-e 's|(\t)(defaultGatewayAuthenticationSidecarImage = getDefaultFromEnv\(util.GetArchitectureDependentEnv\("RELATED_IMAGE_gateway_authentication_sidecar"\)\))|\1// \2|' \
-e 's|(\t)(defaultGatewayAuthorizationSidecarImage = getDefaultFromEnv\(util.GetArchitectureDependentEnv\("RELATED_IMAGE_gateway_authorization_sidecar"\)\))|\1// \2|' \
-e 's|(\t)(defaultGatewayHeaderProxySidecarImage = getDefaultFromEnv\(util.GetArchitectureDependentEnv\("RELATED_IMAGE_gateway_header_sidecar"\)\))|\1// \2|'

sed -i "${TARGETDIR}/pkg/deploy/defaults.go" -r \
-e 's|(\t)(defaultCheTLSSecretsCreationJobImage = util.GetDeploymentEnv\(operatorDeployment, util.GetArchitectureDependentEnv\("RELATED_IMAGE_che_tls_secrets_creation_job"\)\))|\1// \2|' \
-e 's|(\t)(defaultInternalRestBackupServerImage = util.GetDeploymentEnv\(operatorDeployment, util.GetArchitectureDependentEnv\("RELATED_IMAGE_internal_rest_backup_server"\)\))|\1// \2|' \
-e 's|(\t)(defaultInternalRestBackupServerImage = util.GetDeploymentEnv\(operatorDeployment, util.GetArchitectureDependentEnv\("RELATED_IMAGE_single_host_gateway_native_user_mode"\)\))|\1// \2|' \
-e 's|(\t)(defaultGatewayAuthenticationSidecarImage = util.GetDeploymentEnv\(operatorDeployment, util.GetArchitectureDependentEnv\("RELATED_IMAGE_gateway_authentication_sidecar"\)\))|\1// \2|' \
-e 's|(\t)(defaultGatewayAuthorizationSidecarImage = util.GetDeploymentEnv\(operatorDeployment, util.GetArchitectureDependentEnv\("RELATED_IMAGE_gateway_authorization_sidecar"\)\))|\1// \2|' \
-e 's|(\t)(defaultGatewayHeaderProxySidecarImage = util.GetDeploymentEnv\(operatorDeployment, util.GetArchitectureDependentEnv\("RELATED_IMAGE_gateway_header_sidecar"\)\))|\1// \2|'

popd >/dev/null || exit