From c40ebd530a2c94ccecd9e8b07c34e9f0ae8eb2fd Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 7 Feb 2019 14:07:03 +0200 Subject: [PATCH] Update labels. Update relam display name --- deploy/keycloak_provision | 11 ++++++----- pkg/operator/che_cm.go | 1 - pkg/operator/che_role_binding.go | 3 +-- pkg/operator/che_sa.go | 3 +-- pkg/operator/deployment_che.go | 5 ++--- pkg/operator/deployment_keycloak.go | 3 +++ pkg/operator/k8s_helpers.go | 2 +- pkg/operator/k8s_helpers_test.go | 2 +- pkg/operator/pvc.go | 2 +- pkg/operator/role.go | 3 +-- pkg/operator/vars.go | 6 +++--- 11 files changed, 20 insertions(+), 21 deletions(-) diff --git a/deploy/keycloak_provision b/deploy/keycloak_provision index 2fc8ef85f..b9489e329 100644 --- a/deploy/keycloak_provision +++ b/deploy/keycloak_provision @@ -4,7 +4,8 @@ --password $keycloakAdminPassword \ $trustStoreCommandArg \ && /opt/eap/bin/kcadm.sh update realms/master -s sslRequired=none $trustStoreCommandArg \ -&& /opt/eap/bin/kcadm.sh create realms -s realm=$keycloakRealm \ +&& /opt/eap/bin/kcadm.sh create realms -s realm='$keycloakRealm' \ + -s displayName='Codeready Workspaces' \ -s enabled=true \ -s sslRequired=none \ -s registrationAllowed=true \ @@ -13,7 +14,7 @@ -s adminTheme=$keycloakTheme \ -s emailTheme=$keycloakTheme \ $trustStoreCommandArg \ -&& /opt/eap/bin/kcadm.sh create clients -r $keycloakRealm \ +&& /opt/eap/bin/kcadm.sh create clients -r '$keycloakRealm' \ -s clientId=$keycloakClientId \ -s 'webOrigins=["$protocol://$cheHost"]' \ -s 'redirectUris=["$protocol://$cheHost/*"]' \ @@ -21,13 +22,13 @@ -s publicClient=true $trustStoreCommandArg \ && /opt/eap/bin/kcadm.sh create users -s username=admin \ -s email=\"admin@admin.com\" \ - -s enabled=true -r $keycloakRealm \ + -s enabled=true -r '$keycloakRealm' \ -s 'requiredActions=[$requiredActions]' \ $trustStoreCommandArg \ -&& /opt/eap/bin/kcadm.sh set-password -r $keycloakRealm --username admin \ +&& /opt/eap/bin/kcadm.sh set-password -r '$keycloakRealm' --username admin \ --new-password admin \ $trustStoreCommandArg \ -&& /opt/eap/bin/kcadm.sh add-roles -r $keycloakRealm \ +&& /opt/eap/bin/kcadm.sh add-roles -r '$keycloakRealm' \ --uusername admin \ --cclientid broker \ --rolename read-token \ diff --git a/pkg/operator/che_cm.go b/pkg/operator/che_cm.go index a8af77ac1..8d2fc3eaa 100644 --- a/pkg/operator/che_cm.go +++ b/pkg/operator/che_cm.go @@ -29,7 +29,6 @@ func addMap(a map[string]string, b map[string]string) { func newCheConfigMap(cheHost string, keycloakURL string) *corev1.ConfigMap { infra := util.GetInfra() - cheLabels := map[string]string{"app": "che"} openshiftOAuth := util.GetEnvBool("CHE_OPENSHIFT_OAUTH", false) ingressDomain := util.GetEnv("CHE_INFRA_KUBERNETES_INGRESS_DOMAIN", "") strategy := util.GetEnv("CHE_INFRA_KUBERNETES_SERVER__STRATEGY", "multi-host") diff --git a/pkg/operator/che_role_binding.go b/pkg/operator/che_role_binding.go index 153e20ff2..d2b214134 100644 --- a/pkg/operator/che_role_binding.go +++ b/pkg/operator/che_role_binding.go @@ -21,7 +21,6 @@ import ( ) func newRoleBinding(kind string,name string, serviceAccountName string, roleName string, roleKind string) *rbac.RoleBinding { - labels := map[string]string{"app": "che"} return &rbac.RoleBinding{ TypeMeta: metav1.TypeMeta{ Kind: kind, @@ -30,7 +29,7 @@ func newRoleBinding(kind string,name string, serviceAccountName string, roleName ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace, - Labels: labels, + Labels: cheLabels, }, Subjects: []rbac.Subject{ diff --git a/pkg/operator/che_sa.go b/pkg/operator/che_sa.go index 8456bb4cf..1b88f133e 100644 --- a/pkg/operator/che_sa.go +++ b/pkg/operator/che_sa.go @@ -20,7 +20,6 @@ import ( ) func newServiceAccount(name string) *corev1.ServiceAccount { - labels := map[string]string{"app": "che"} return &corev1.ServiceAccount{ TypeMeta: metav1.TypeMeta{ Kind: "ServiceAccount", @@ -29,7 +28,7 @@ func newServiceAccount(name string) *corev1.ServiceAccount { ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace, - Labels: labels, + Labels: cheLabels, }, } diff --git a/pkg/operator/deployment_che.go b/pkg/operator/deployment_che.go index 5f40a32be..93b3c2fc7 100644 --- a/pkg/operator/deployment_che.go +++ b/pkg/operator/deployment_che.go @@ -24,7 +24,6 @@ import ( ) func newCheDeployment(cheImage string) *appsv1.Deployment { - cheLabels := map[string]string{"app": "che"} optionalEnv := true return &appsv1.Deployment{ TypeMeta: metav1.TypeMeta{ @@ -32,7 +31,7 @@ func newCheDeployment(cheImage string) *appsv1.Deployment { APIVersion: "apps/v1", }, ObjectMeta: metav1.ObjectMeta{ - Name: "che", + Name: cheFlavor, Namespace: namespace, Labels: cheLabels, }, @@ -49,7 +48,7 @@ func newCheDeployment(cheImage string) *appsv1.Deployment { ServiceAccountName: "che", Containers: []corev1.Container{ { - Name: "che", + Name: cheFlavor, ImagePullPolicy: corev1.PullIfNotPresent, Image: cheImage, Ports: []corev1.ContainerPort{ diff --git a/pkg/operator/deployment_keycloak.go b/pkg/operator/deployment_keycloak.go index a1edbb473..7803a5852 100644 --- a/pkg/operator/deployment_keycloak.go +++ b/pkg/operator/deployment_keycloak.go @@ -199,6 +199,9 @@ func CreateKeycloakDeployment() (*appsv1.Deployment, error) { func GetKeycloakProvisionCommand(keycloakURL string, cheHost string) (command string) { openShiftApiUrl := util.GetEnv("CHE_OPENSHIFT_API_URL", "") + //if cheFlavor == "codeready" { + // keycloakRealm = "codeready%20workspaces" + //} requiredActions := "" if updateAdminPassword { requiredActions = "\"UPDATE_PASSWORD\"" diff --git a/pkg/operator/k8s_helpers.go b/pkg/operator/k8s_helpers.go index b8c4dd902..332ffdbe7 100644 --- a/pkg/operator/k8s_helpers.go +++ b/pkg/operator/k8s_helpers.go @@ -162,7 +162,7 @@ func (o *k8s) ExecToPod(command []string, podName, namespace string) (string, st func (o *k8s) GetDeploymentPod(name string) (podName string) { api := o.clientset.CoreV1() listOptions := metav1.ListOptions{ - LabelSelector: "app=" + name, + LabelSelector: "component=" + name, } podList, _ := api.Pods(namespace).List(listOptions) podListItems := podList.Items diff --git a/pkg/operator/k8s_helpers_test.go b/pkg/operator/k8s_helpers_test.go index 11fb4d182..67c889743 100644 --- a/pkg/operator/k8s_helpers_test.go +++ b/pkg/operator/k8s_helpers_test.go @@ -30,7 +30,7 @@ func TestGetDeploymentPod(t *testing.T) { Name: "fake-pod", Namespace: "eclipse-che", Labels: map[string]string{ - "app": "postgres", + "component": "postgres", }, }, }) diff --git a/pkg/operator/pvc.go b/pkg/operator/pvc.go index f9e3c754c..9f9167493 100644 --- a/pkg/operator/pvc.go +++ b/pkg/operator/pvc.go @@ -30,7 +30,7 @@ func pvc(name string, pvcClaimSize string, labels map[string]string) *corev1.Per ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace, - Labels: labels, + Labels: cheLabels, }, Spec: corev1.PersistentVolumeClaimSpec{ diff --git a/pkg/operator/role.go b/pkg/operator/role.go index b9ac67b8a..3f106398e 100644 --- a/pkg/operator/role.go +++ b/pkg/operator/role.go @@ -20,7 +20,6 @@ import ( ) func newRole(name string, resources []string, verbs []string) *rbac.Role { - labels := map[string]string{"app": "che"} return &rbac.Role{ TypeMeta: metav1.TypeMeta{ Kind: "Role", @@ -29,7 +28,7 @@ func newRole(name string, resources []string, verbs []string) *rbac.Role { ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace, - Labels: labels, + Labels: cheLabels, }, Rules: []rbac.PolicyRule{ { diff --git a/pkg/operator/vars.go b/pkg/operator/vars.go index d99751e7a..3c5fec365 100644 --- a/pkg/operator/vars.go +++ b/pkg/operator/vars.go @@ -69,7 +69,7 @@ var ( cheImage = util.GetEnv("CHE_IMAGE", "eclipse/che-server:latest") - postgresLabels = map[string]string{"app": "postgres"} - keycloakLabels = map[string]string{"app": "keycloak"} - cheLabels = map[string]string{"app": "che"} + postgresLabels = map[string]string{"component": "postgres", "app": cheFlavor} + keycloakLabels = map[string]string{"component": "keycloak", "app": cheFlavor} + cheLabels = map[string]string{"component": cheFlavor, "app": cheFlavor} )