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

Fix potential NPE (#587) 

Signed-off-by: Mykola Morhun <mmorhun@redhat.com>
pull/592/head
Mykola Morhun 2020-12-18 14:07:39 +02:00 committed by GitHub
parent fd9edb15c8
commit cdb613a73d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
local-debug.sh
View File

@ -72,7 +72,7 @@ echo "WATCH_NAMESPACE='${CHE_NAMESPACE}'" >> ${ENV_FILE}
echo "[WARN] Make sure that your CR contains valid ingress domain!"
operator-sdk run --local --watch-namespace=${CHE_NAMESPACE} --enable-delve &
operator-sdk run --local --namespace ${CHE_NAMESPACE} --enable-delve &
OPERATOR_SDK_PID=$!
wait ${OPERATOR_SDK_PID}

9
pkg/deploy/server/che_configmap.go
View File

@ -282,6 +282,15 @@ func GetCheConfigMapData(deployContext *deploy.DeployContext) (cheEnv map[string
if err != nil {
return nil, err
}
if cheTLSSecret == nil {
return nil, fmt.Errorf("%s secret not found", deployContext.CheCluster.Spec.K8s.TlsSecretName)
}
if _, exists := cheTLSSecret.Data["tls.key"]; !exists {
return nil, fmt.Errorf("%s secret has no 'tls.key' key in data", deployContext.CheCluster.Spec.K8s.TlsSecretName)
}
if _, exists := cheTLSSecret.Data["tls.crt"]; !exists {
return nil, fmt.Errorf("%s secret has no 'tls.crt' key in data", deployContext.CheCluster.Spec.K8s.TlsSecretName)
}
k8sCheEnv["CHE_INFRA_KUBERNETES_TLS__KEY"] = string(cheTLSSecret.Data["tls.key"])
k8sCheEnv["CHE_INFRA_KUBERNETES_TLS__CERT"] = string(cheTLSSecret.Data["tls.crt"])
}