Align app, component labels in helm chart and openshift templates (ec…

…lipse-che#18655)
xiaochen2050 · Dec 18, 2020 · 0c70efa · 0c70efa
1 parent 08868bf
commit 0c70efa
Show file tree

Hide file tree

Showing 33 changed files with 84 additions and 9 deletions.
diff --git a/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/templates/ingress.yaml b/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/templates/ingress.yaml
@@ -13,6 +13,9 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: devfile-registry
+  labels:
+    app: che
+    component: devfile-registry
   annotations:
     kubernetes.io/ingress.class: {{ .Values.global.ingress.class | quote }}
     {{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout: "3600"

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-gateway/templates/role.yaml b/deploy/kubernetes/helm/che/custom-charts/che-gateway/templates/role.yaml
@@ -11,6 +11,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: che-gateway
+  labels:
+    app: che
+    component: che-gateway
 rules:
   - verbs:
       - watch

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-gateway/templates/rolebinding.yaml b/deploy/kubernetes/helm/che/custom-charts/che-gateway/templates/rolebinding.yaml
@@ -11,6 +11,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: che-gateway
+  labels:
+    app: che
+    component: che-gateway
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-jaeger/templates/deployment.yaml b/deploy/kubernetes/helm/che/custom-charts/che-jaeger/templates/deployment.yaml
@@ -12,8 +12,8 @@ kind: Deployment
 metadata:
   name: jaeger
   labels:
-      app: jaeger
-      jaeger-infra: jaeger-deployment
+    app: jaeger
+    jaeger-infra: jaeger-deployment
 spec:
   replicas: 1
   selector:

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-jaeger/templates/ingress.yaml b/deploy/kubernetes/helm/che/custom-charts/che-jaeger/templates/ingress.yaml
@@ -14,6 +14,9 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: jaeger-query
+  labels:
+    app: jaeger
+    jaeger-infra: jaeger-deployment
   annotations:
     kubernetes.io/ingress.class: {{ .Values.global.ingress.class | quote }}
     {{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout: "3600"

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/endpoints-monitor-role.yaml b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/endpoints-monitor-role.yaml
@@ -12,6 +12,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: {{ .Release.Namespace }}
   name: che-endpoints-monitor
+  labels:
+    app: che
+    component: keycloak
 rules:
 - apiGroups: [""]
   resources: ["services", "endpoints", "pods"]

diff --git a/...bernetes/helm/che/custom-charts/che-keycloak/templates/endpoints-monitor-rolebinding.yaml b/...bernetes/helm/che/custom-charts/che-keycloak/templates/endpoints-monitor-rolebinding.yaml
@@ -11,6 +11,9 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: {{ .Release.Namespace -}} -keycloak-role-binding
+  labels:
+    app: che
+    component: keycloak
 roleRef:
   kind: Role
   name: che-endpoints-monitor

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/ingress.yaml b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/ingress.yaml
@@ -13,6 +13,9 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: keycloak-ingress
+  labels:
+    app: che
+    component: keycloak
   annotations:
     kubernetes.io/ingress.class: {{ .Values.global.ingress.class | quote }}
     {{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout: "3600"

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/keycloak-data-claim.yaml b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/keycloak-data-claim.yaml
@@ -11,6 +11,8 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   labels:
+    app: che
+    component: keycloak
     io.kompose.service: keycloak-data
   name: keycloak-data
 spec:

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/keycloak-log-claim.yaml b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/keycloak-log-claim.yaml
@@ -11,6 +11,8 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   labels:
+    app: che
+    component: keycloak
     io.kompose.service: keycloak-log
   name: keycloak-log
 spec:

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/service.yaml b/deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/service.yaml
@@ -10,7 +10,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "keycloak"
+  name: keycloak
+  labels:
+    app: che
+    component: keycloak
 spec:
   ports:
   - name: "5050"

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/templates/ingress.yaml b/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/templates/ingress.yaml
@@ -13,6 +13,9 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: plugin-registry
+  labels:
+    app: che
+    component: plugin-registry
   annotations:
     kubernetes.io/ingress.class: {{ .Values.global.ingress.class | quote }}
     {{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout: "3600"

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-postgres/templates/deployment.yaml b/deploy/kubernetes/helm/che/custom-charts/che-postgres/templates/deployment.yaml
@@ -11,7 +11,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  creationTimestamp: null
   labels:
     app: che
     component: postgres

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-postgres/templates/postgres-data-claim.yaml b/deploy/kubernetes/helm/che/custom-charts/che-postgres/templates/postgres-data-claim.yaml
@@ -10,9 +10,10 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: postgres-data
+    app: che
+    component: postgres
   name: postgres-data
 spec:
   {{- if .Values.global.chePostgresPVCStorageClassName }}

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-postgres/templates/service.yaml b/deploy/kubernetes/helm/che/custom-charts/che-postgres/templates/service.yaml
@@ -10,9 +10,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: postgres
+    app: che
+    component: postgres
   name: postgres
 spec:
   ports:

diff --git a/deploy/kubernetes/helm/che/templates/cluster-role-binding.yaml b/deploy/kubernetes/helm/che/templates/cluster-role-binding.yaml
@@ -11,6 +11,9 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: {{ .Release.Namespace -}} -che-clusterrole-binding
+  labels:
+    app: che
+    component: che
 roleRef:
   kind: ClusterRole
   name: cluster-admin

diff --git a/deploy/kubernetes/helm/che/templates/dashboard-ingress.yaml b/deploy/kubernetes/helm/che/templates/dashboard-ingress.yaml
@@ -15,6 +15,9 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: che-dashboard-ingress
+  labels:
+    app: che
+    component: che-dashboard
   annotations:
     kubernetes.io/ingress.class: {{ .Values.global.ingress.class | quote }}
     {{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout: "3600"

diff --git a/deploy/kubernetes/helm/che/templates/exec-role.yaml b/deploy/kubernetes/helm/che/templates/exec-role.yaml
@@ -13,6 +13,9 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: exec
   namespace: {{ .Values.global.cheWorkspacesNamespace }}
+  labels:
+    app: che
+    component: che
 rules:
 - apiGroups:
   - ""

diff --git a/deploy/kubernetes/helm/che/templates/ingress.yaml b/deploy/kubernetes/helm/che/templates/ingress.yaml
@@ -11,6 +11,9 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: che-ingress
+  labels:
+    app: che
+    component: che
   annotations:
     kubernetes.io/ingress.class: {{ .Values.global.ingress.class | quote }}
     {{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout: "3600"

diff --git a/deploy/kubernetes/helm/che/templates/registry-pull-secret.yaml b/deploy/kubernetes/helm/che/templates/registry-pull-secret.yaml
@@ -19,6 +19,9 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: registry-pull-secret
+  labels:
+    app: che
+    component: che
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ template "imagePullSecret" . }}

diff --git a/deploy/kubernetes/helm/che/templates/workspace-exec-role-binding.yaml b/deploy/kubernetes/helm/che/templates/workspace-exec-role-binding.yaml
@@ -13,6 +13,9 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: che-workspace-exec
   namespace: {{ .Values.global.cheWorkspacesNamespace }}
+  labels:
+    app: che
+    component: che
 roleRef:
   kind: Role
   name: exec

diff --git a/deploy/kubernetes/helm/che/templates/workspace-service-account.yaml b/deploy/kubernetes/helm/che/templates/workspace-service-account.yaml
@@ -13,4 +13,7 @@ apiVersion: v1
 metadata:
   name: {{ .Values.global.cheWorkspaceServiceAccount }}
   namespace: {{ .Values.global.cheWorkspacesNamespace }}
+  labels:
+    app: che
+    component: che
 {{- end }}
diff --git a/deploy/kubernetes/helm/che/templates/workspace-view-role-binding.yaml b/deploy/kubernetes/helm/che/templates/workspace-view-role-binding.yaml
@@ -13,6 +13,9 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: che-workspace-view
   namespace: {{ .Values.global.cheWorkspacesNamespace }}
+  labels:
+    app: che
+    component: che
 roleRef:
   kind: Role
   name: workspace-view

diff --git a/deploy/kubernetes/helm/che/templates/workspace-view-role.yaml b/deploy/kubernetes/helm/che/templates/workspace-view-role.yaml
@@ -13,6 +13,9 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: workspace-view
   namespace: {{ .Values.global.cheWorkspacesNamespace }}
+  labels:
+    app: che
+    component: che
 rules:
 - apiGroups:
   - ""

diff --git a/deploy/openshift/templates/che-devfile-registry.yml b/deploy/openshift/templates/che-devfile-registry.yml
@@ -98,3 +98,6 @@ parameters:
   value: Always
   displayName: Eclipse Che devfile registry image pull policy
   description: Always pull by default. Can be IfNotPresent
+labels:
+  app: che
+  component: devfile-registry
diff --git a/deploy/openshift/templates/che-plugin-registry.yml b/deploy/openshift/templates/che-plugin-registry.yml
@@ -98,3 +98,6 @@ parameters:
   value: Always
   displayName: Eclipse Che plugin registry image pull policy
   description: Always pull by default. Can be IfNotPresent
+labels:
+  app: che
+  component: plugin-registry
diff --git a/deploy/openshift/templates/che-server-template.yaml b/deploy/openshift/templates/che-server-template.yaml
@@ -421,4 +421,5 @@ parameters:
   value: ''
 labels:
   app: che
+  component: che
   template: che
diff --git a/deploy/openshift/templates/che-workspace-service-account.yaml b/deploy/openshift/templates/che-workspace-service-account.yaml
@@ -76,3 +76,7 @@ parameters:
   displayName: Service account namespace
   description: Namespace where service account should be created
   required: true
+labels:
+  app: che
+  component: che
+  template: che-workspace-service-account
diff --git a/deploy/openshift/templates/https/che-route-tls.yaml b/deploy/openshift/templates/https/che-route-tls.yaml
@@ -12,6 +12,7 @@ kind: Route
 metadata:
     labels:
       app: che
+      component: che
     name: che
 spec:
     tls:

diff --git a/deploy/openshift/templates/https/keycloak-route-tls.yaml b/deploy/openshift/templates/https/keycloak-route-tls.yaml
@@ -11,7 +11,8 @@ apiVersion: v1
 kind: Route
 metadata:
   labels:
-    app: keycloak
+    app: che
+    component: keycloak
   name: keycloak
 spec:
   tls:

diff --git a/deploy/openshift/templates/multi/keycloak-template.yaml b/deploy/openshift/templates/multi/keycloak-template.yaml
@@ -183,5 +183,6 @@ parameters:
   description: Always pull by default. Can be IfNotPresent
   value: 'Always'
 labels:
-  app: keycloak
+  app: che
+  component: keycloak
   template: keycloak
diff --git a/deploy/openshift/templates/multi/postgres-template.yaml b/deploy/openshift/templates/multi/postgres-template.yaml
@@ -119,5 +119,6 @@ parameters:
   description: Enable Postgres DB debug log mode
   value: "false"
 labels:
-  app: postgres
+  app: che
+  component: postgres
   template: postgres
diff --git a/deploy/openshift/templates/pvc/che-server-pvc.yaml b/deploy/openshift/templates/pvc/che-server-pvc.yaml
@@ -11,6 +11,7 @@ kind: PersistentVolumeClaim
 metadata:
   labels:
     app: che
+    component: che
   name: che-data-volume
 spec:
  accessModes: