Merge ebbb6dd into c65f9c9

reanahub · Jun 9, 2020 · 3556362 · 3556362
2 parents c65f9c9 + ebbb6dd
commit 3556362
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -179,7 +179,7 @@ deploy: # Deploy/redeploy previously built REANA cluster.
 	source ${HOME}/.virtualenvs/${INSTANCE_NAME}/bin/activate && \
 	minikube docker-env --profile ${INSTANCE_NAME} > /dev/null && eval $$(minikube docker-env --profile ${INSTANCE_NAME}) && \
 	helm dep update helm/reana && (helm ls | grep -q ${TRUNC_INSTANCE_NAME} && helm uninstall ${TRUNC_INSTANCE_NAME}) && \
-	kubectl get secrets -o custom-columns=":metadata.name" | grep ${TRUNC_INSTANCE_NAME} | xargs kubectl delete secret || \
+	kubectl delete namespace ${INSTANCE_NAME} || \
 	waited=0 && while true; do \
 		waited=$$(($$waited+${TIMECHECK})); \
 		if [ $$waited -gt ${TIMEOUT} ];then \
@@ -194,7 +194,7 @@ deploy: # Deploy/redeploy previously built REANA cluster.
 	if [ $$(docker images | grep -c '<none>') -gt 0 ]; then \
 		docker images | grep '<none>' | awk '{print $$3;}' | xargs docker rmi; \
 	fi && \
-	helm install ${TRUNC_INSTANCE_NAME} helm/reana $(addprefix --set , ${CLUSTER_FLAGS}) $(addprefix -f , ${VALUES_YAML_PATH}) --wait && \
+	helm install ${TRUNC_INSTANCE_NAME} helm/reana $(addprefix --set , ${CLUSTER_FLAGS}) $(addprefix -f , ${VALUES_YAML_PATH}) --wait --namespace ${INSTANCE_NAME} --create-namespace && \
 	waited=0 && while true; do \
 		waited=$$(($$waited+${TIMECHECK})); \
 		if [ $$waited -gt ${TIMEOUT} ];then \

diff --git a/helm/reana/README.md b/helm/reana/README.md
@@ -51,7 +51,6 @@ This Helm automatically prefixes all names using the release name to avoid colli
 | `secrets.reana.REANA_SECRET_KEY`                         | **[Do not use in production, use secrets instead]** REANA encryption secret key     | None                                            |
 | `serviceAccount.create`                                  | Create a service account for the REANA system user                                   | true                                            |
 | `serviceAccount.name`                                    | Service account name                                                                 | reana                                           |
-| `serviceAccount.namespace`                               | Service account namespace                                                            | default                                         |
 | `shared_storage.access_modes`                            | Shared volume access mode                                                            | ReadWriteMany                                   |
 | `shared_storage.backend`                                 | Shared volume storage backend                                                        | hostpath                                        |
 | `shared_storage.cephfs.availability_zone`                | **[CERN only]** OpenStack Availability zone                                          | nova                                            |

diff --git a/helm/reana/templates/announcement-config.yaml b/helm/reana/templates/announcement-config.yaml
@@ -3,5 +3,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: announcement-config
+  namespace: {{ .Release.Namespace }}
 data:
   announcement: ""
diff --git a/helm/reana/templates/cronjobs.yaml b/helm/reana/templates/cronjobs.yaml
@@ -4,6 +4,7 @@ apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: {{ include "reana.prefix" . }}-system-status
+  namespace: {{ .Release.Namespace }}
 spec:
   schedule: "{{ .Values.notifications.system_status }}"
   jobTemplate:

diff --git a/helm/reana/templates/ingress.yaml b/helm/reana/templates/ingress.yaml
@@ -7,6 +7,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ include "reana.prefix" . }}-ingress
+  namespace: {{ .Release.Namespace }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/helm/reana/templates/kerberos-config.yaml b/helm/reana/templates/kerberos-config.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "reana.prefix" . }}-krb5-conf
+  namespace: {{ .Release.Namespace }}
 data:
   krb5.conf: |
         [libdefaults]

diff --git a/helm/reana/templates/reana-cache.yaml b/helm/reana/templates/reana-cache.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "reana.prefix" . }}-cache
+  namespace: {{ .Release.Namespace }}
 spec:
   type: NodePort
   selector:
@@ -16,6 +17,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-cache
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:

diff --git a/helm/reana/templates/reana-db.yaml b/helm/reana/templates/reana-db.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "reana.prefix" . }}-db
+  namespace: {{ .Release.Namespace }}
 spec:
   type: NodePort
   selector:
@@ -17,6 +18,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-db
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:

diff --git a/helm/reana/templates/reana-mail.yaml b/helm/reana/templates/reana-mail.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "reana.prefix" . }}-mail
+  namespace: {{ .Release.Namespace }}
 spec:
   type: "NodePort"
   ports:
@@ -24,6 +25,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-mail
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:

diff --git a/helm/reana/templates/reana-message-broker.yaml b/helm/reana/templates/reana-message-broker.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "reana.prefix" . }}-message-broker
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
    - port: 5672
@@ -20,6 +21,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-message-broker
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:

diff --git a/helm/reana/templates/reana-server.yaml b/helm/reana/templates/reana-server.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "reana.prefix" . }}-server
+  namespace: {{ .Release.Namespace }}
 spec:
   type: "NodePort"
   ports:
@@ -17,6 +18,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-server
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:

diff --git a/helm/reana/templates/reana-shared-persistent-volume.yaml b/helm/reana/templates/reana-shared-persistent-volume.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "reana.prefix" . }}-shared-persistent-volume
+  namespace: {{ .Release.Namespace }}
 spec:
   accessModes:
   - {{ .Values.shared_storage.access_modes }}
@@ -18,6 +19,7 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: {{ include "reana.prefix" . }}-shared-volume-storage-class
+  namespace: {{ .Release.Namespace }}
 provisioner: {{ .Values.shared_storage.cephfs.provisioner }}
 parameters:
   type: {{ .Values.shared_storage.cephfs.type }}

diff --git a/helm/reana/templates/reana-ui.yaml b/helm/reana/templates/reana-ui.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "reana.prefix" . }}-ui
+  namespace: {{ .Release.Namespace }}
 spec:
   type: "NodePort"
   ports:
@@ -18,6 +19,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-ui
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:

diff --git a/helm/reana/templates/reana-wdb.yaml b/helm/reana/templates/reana-wdb.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "reana.prefix" . }}-wdb
+  namespace: {{ .Release.Namespace }}
 spec:
   type: "NodePort"
   ports:
@@ -23,6 +24,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-wdb
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:

diff --git a/helm/reana/templates/reana-workflow-controller.yaml b/helm/reana/templates/reana-workflow-controller.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "reana.prefix" . }}-workflow-controller
+  namespace: {{ .Release.Namespace }}
 spec:
   type: "NodePort"
   ports:
@@ -17,6 +18,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-workflow-controller
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
@@ -51,6 +53,8 @@ spec:
         env:
           - name: REANA_COMPONENT_PREFIX
             value: {{ include "reana.prefix" . }}
+          - name: REANA_KUBERNETES_NAMESPACE
+            value: {{ .Release.Namespace }}
           {{- if .Values.naming_scheme }}
           - name: REANA_COMPONENT_NAMING_SCHEME
             value: {{ .Values.naming_scheme }}
@@ -133,6 +137,8 @@ spec:
         env:
         - name: REANA_COMPONENT_PREFIX
           value: {{ include "reana.prefix" . }}
+        - name: REANA_KUBERNETES_NAMESPACE
+          value: {{ .Release.Namespace }}
         {{- range $key, $value := .Values.db_env_config }}
         - name: {{ $key }}
           value: {{ $value | quote }}

diff --git a/helm/reana/templates/roles.yaml b/helm/reana/templates/roles.yaml
@@ -2,8 +2,8 @@
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  namespace: default
   name: {{ include "reana.prefix" . }}-deployment-manager
+  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups: [""] # "" indicates the core API group
   resources: ["nodes", "nodes/status", "pods", "pods/log", "secrets", "persistentvolumeclaims", "configmaps"]
@@ -23,11 +23,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "reana.prefix" . }}-manage-deployments
+  namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: {{ include "reana.prefix" . }}-deployment-manager
 subjects:
 - kind: ServiceAccount
   name: {{ include "reana.prefixed_svaccount_name" . }}
-  namespace: default
+  namespace: {{ .Release.Namespace }}
diff --git a/helm/reana/templates/secrets.yaml b/helm/reana/templates/secrets.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "reana.prefix" . }}-db-secrets
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/resource-policy": keep
 type: Opaque
@@ -14,6 +15,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "reana.prefix" . }}-cern-sso-secrets
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/resource-policy": keep
 type: Opaque
@@ -25,6 +27,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "reana.prefix" . }}-cern-gitlab-secrets
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/resource-policy": keep
 type: Opaque
@@ -37,6 +40,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "reana.prefix" . }}-secrets
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/resource-policy": keep
 type: Opaque
@@ -48,6 +52,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "reana.prefix" . }}-mail-notification-sender-password
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/resource-policy": keep
 type: Opaque

diff --git a/helm/reana/templates/serviceaccount.yaml b/helm/reana/templates/serviceaccount.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "reana.prefixed_svaccount_name" . }}
-  namespace: {{ .Values.serviceAccount.namespace }}
+  namespace: {{ .Release.Namespace }}
diff --git a/helm/reana/templates/uwsgi-config.yaml b/helm/reana/templates/uwsgi-config.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: uwsgi-config
+  namespace: {{ .Release.Namespace }}
 data:
   uwsgi.ini: |
     [uwsgi]

diff --git a/helm/reana/values.yaml b/helm/reana/values.yaml
@@ -96,7 +96,6 @@ ingress:
 serviceAccount:
   create: true
   name: reana
-  namespace: default
 
 # Traefik's chart values.yaml
 traefik:
@@ -105,10 +104,6 @@ traefik:
     enabled: true
   dashboard:
     enabled: true
-  kubernetes:
-    namespaces:
-      - default
-      - kube-system
   serviceType: NodePort
   service:
     nodePorts: