seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into migreate_tests

pull/451/head
Flavius Lacatusu 2020-09-22 10:50:07 +02:00
parent a4fe033b96 cf8c32694b
commit c1aabed059
No known key found for this signature in database
GPG Key ID: AB9AB3E390E38ABD
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -32,7 +32,7 @@ COPY --from=builder /tmp/che-operator/che-operator /usr/local/bin/che-operator
COPY --from=builder /che-operator/templates/keycloak_provision /tmp/keycloak_provision
COPY --from=builder /che-operator/templates/oauth_provision /tmp/oauth_provision
# apply CVE fixes, if required
RUN microdnf update -y libnghttp2 && microdnf clean all && rm -rf /var/cache/yum && echo "Installed Packages" && rpm -qa | sort -V && echo "End Of Installed Packages"
RUN microdnf update -y librepo libnghttp2 && microdnf clean all && rm -rf /var/cache/yum && echo "Installed Packages" && rpm -qa | sort -V && echo "End Of Installed Packages"
CMD ["che-operator"]
# append Brew metadata here (it will be appended via https://github.com/redhat-developer/codeready-workspaces-operator/blob/master/operator.Jenkinsfile)

2
olm/update-nightly-bundle.sh
View File

@ -131,7 +131,7 @@ do
if [[ -n "$TAG" ]]; then
echo "[INFO] Set tags in nightly OLM files"
sed -i 's/'$RELEASE'/'$TAG'/g' ${NEW_CSV}
sed -ri "s/(.*:\s?)${RELEASE}([^-])?$/\1${TAG}\2/" "${NEW_CSV}"
fi
if [[ $platform == "openshift" ]]; then

21
pkg/deploy/defaults_test.go
View File

@ -18,6 +18,7 @@ import (
"testing"
orgv1 "github.com/eclipse/che-operator/pkg/apis/org/v1"
util "github.com/eclipse/che-operator/pkg/util"
"gopkg.in/yaml.v2"
appsv1 "k8s.io/api/apps/v1"
)
@ -46,25 +47,25 @@ func init() {
switch env.Name {
case "CHE_VERSION":
cheVersionTest = env.Value
case "RELATED_IMAGE_che_server":
case util.GetArchitectureDependentEnv("RELATED_IMAGE_che_server"):
cheServerImageTest = env.Value
case "RELATED_IMAGE_plugin_registry":
case util.GetArchitectureDependentEnv("RELATED_IMAGE_plugin_registry"):
pluginRegistryImageTest = env.Value
case "RELATED_IMAGE_devfile_registry":
case util.GetArchitectureDependentEnv("RELATED_IMAGE_devfile_registry"):
devfileRegistryImageTest = env.Value
case "RELATED_IMAGE_che_tls_secrets_creation_job":
case util.GetArchitectureDependentEnv("RELATED_IMAGE_che_tls_secrets_creation_job"):
tlsJobImageTest = env.Value
case "RELATED_IMAGE_pvc_jobs":
case util.GetArchitectureDependentEnv("RELATED_IMAGE_pvc_jobs"):
pvcJobsImageTest = env.Value
case "RELATED_IMAGE_postgres":
case util.GetArchitectureDependentEnv("RELATED_IMAGE_postgres"):
postgresImageTest = env.Value
case "RELATED_IMAGE_keycloak":
case util.GetArchitectureDependentEnv("RELATED_IMAGE_keycloak"):
keycloakImageTest = env.Value
case "RELATED_IMAGE_che_workspace_plugin_broker_metadata":
case util.GetArchitectureDependentEnv("RELATED_IMAGE_che_workspace_plugin_broker_metadata"):
brokerMetadataTest = env.Value
case "RELATED_IMAGE_che_workspace_plugin_broker_artifacts":
case util.GetArchitectureDependentEnv("RELATED_IMAGE_che_workspace_plugin_broker_artifacts"):
brokerArtifactsTest = env.Value
case "RELATED_IMAGE_che_server_secure_exposer_jwt_proxy_image":
case util.GetArchitectureDependentEnv("RELATED_IMAGE_che_server_secure_exposer_jwt_proxy_image"):
jwtProxyTest = env.Value
}
}

2
templates/keycloak_provision
View File

@ -10,7 +10,7 @@ if [ $? -eq 0 ]; then echo "Realm exists"; exit 0; fi \
-s displayName='$realmDisplayName' \
-s enabled=true \
-s sslRequired=none \
-s registrationAllowed=true \
-s registrationAllowed=false \
-s resetPasswordAllowed=true \
-s loginTheme=$keycloakTheme \
-s accountTheme=$keycloakTheme \