Merge branch 'release/v2.0-beta-3' into 978-migrate-users

Author: longshuicy

deployments/kubernetes/charts/clowder2/templates/_helpers.tpl

@@ -5,6 +5,13 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Define release name.
+*/}}
+{{- define "clowder2.releaseName" -}}
+{{- default .Release.Name .Values.releaseOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).

deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml

@@ -39,13 +39,13 @@ spec:
             - name: WEB_CONCURRENCY
               value: "1"
             - name: MINIO_SERVER_URL
-              value: {{ .Values.backend.env.MINIO_SERVER_URL }}
+              value: {{ include "clowder2.releaseName" . }}-minio:9000
             - name: MINIO_EXTERNAL_SERVER_URL
               value: minio-api.{{ .Values.hostname }}
             - name: MINIO_SECURE
-              value: {{ .Values.backend.env.MINIO_SECURE | quote }}
+              value: "true"
             - name: MINIO_BUCKET_NAME
-              value: {{ .Values.backend.env.MINIO_BUCKET_NAME }}
+              value: clowder
             - name: MINIO_ACCESS_KEY
               value: {{ .Values.minio.auth.rootUser }}
             - name: MINIO_SECRET_KEY
@@ -61,9 +61,9 @@ spec:
                   key: root-password
               {{- end }}
             - name: MINIO_UPLOAD_CHUNK_SIZE
-              value: {{ .Values.backend.env.MINIO_UPLOAD_CHUNK_SIZE | quote}}
+              value: "10485760"
             - name: MONGODB_URL
-              value: {{ .Values.backend.env.MONGODB_URL }}
+              value: mongodb://{{ include "clowder2.releaseName" . }}-mongodb:27017
             - name: MONGO_DATABASE
               value: {{ .Values.mongodb.database }}
             - name: CLOWDER2_URL
@@ -79,19 +79,19 @@ spec:
             - name: auth_url
               value: $(CLOWDER2_URL)/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code
             - name: oauth2_scheme_auth_url
-              value: {{ .Values.backend.env.oauth2_scheme_auth_url }}
+              value: http://{{ include "clowder2.releaseName" .}}-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code
             - name: auth_register_url
-              value: $(CLOWDER2_URL){{ .Values.backend.env.auth_register_url }}
+              value: $(CLOWDER2_URL)/keycloak/realms/clowder/protocol/openid-connect/registrations?client_id=clowder2-backend&response_type=code&redirect_uri=$(auth_redirect_uri)&scope=openid%20email
             - name: auth_token_url
-              value: {{ .Values.backend.env.auth_token_url }}
+              value: http://{{ include "clowder2.releaseName" .}}-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/token
             - name: auth_server_url
               value: $(CLOWDER2_URL)/keycloak/
             - name: keycloak_base
               value: $(CLOWDER2_URL)/api
             - name: frontend_url
               value: $(CLOWDER2_URL)
             - name: elasticsearch_url
-              value: {{ .Values.backend.env.elasticsearch_url }}
+              value: http://{{ include "clowder2.releaseName" . }}-elasticsearch:9200
             - name: elasticsearch_no_of_shards
               value: "5"
             - name: elasticsearch_no_of_replicas
@@ -111,11 +111,11 @@ spec:
                   key: rabbitmq-password
               {{- end }}
             - name: RABBITMQ_HOST
-              value: {{ .Values.backend.env.RABBITMQ_HOST }}
+              value: {{ include "clowder2.releaseName" .  }}-rabbitmq
             - name: HEARTBEAT_EXCHANGE
               value: "extractors"
             - name: API_HOST
-              value: {{ .Values.backend.env.API_HOST }}
+              value: http://{{ include "clowder2.fullname" . }}-backend:{{ .Values.backend.service.port }}
           ports:
             - name: http
               containerPort: 80

deployments/kubernetes/charts/clowder2/templates/heartbeat/deployment.yaml

@@ -34,7 +34,7 @@ spec:
           imagePullPolicy: {{ .Values.heartbeat.image.pullPolicy }}
           env:
             - name: MONGODB_URL
-              value: {{ .Values.heartbeat.env.MONGODB_URL }}
+              value: mongodb://{{ include "clowder2.releaseName" . }}-mongodb:27017
             - name: RABBITMQ_USER
               value: {{ .Values.rabbitmq.auth.username }}
             - name: RABBITMQ_PASS
@@ -50,7 +50,7 @@ spec:
                   key: rabbitmq-password
               {{- end }}
             - name: RABBITMQ_HOST
-              value: {{ .Values.heartbeat.env.RABBITMQ_HOST }}
+              value: {{ include "clowder2.releaseName" .  }}-rabbitmq
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deployments/kubernetes/charts/clowder2/templates/messages/deployment.yaml

@@ -34,7 +34,7 @@ spec:
           imagePullPolicy: {{ .Values.message.image.pullPolicy }}
           env:
             - name: MONGODB_URL
-              value: {{ .Values.message.env.MONGODB_URL }}
+              value: mongodb://{{ include "clowder2.releaseName" . }}-mongodb:27017
             - name: RABBITMQ_USER
               value: {{ .Values.rabbitmq.auth.username }}
             - name: RABBITMQ_PASS
@@ -50,7 +50,7 @@ spec:
                   key: rabbitmq-password
               {{- end }}
             - name: RABBITMQ_HOST
-              value: {{ .Values.message.env.RABBITMQ_HOST }}
+              value: {{ include "clowder2.releaseName" .  }}-rabbitmq
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deployments/kubernetes/charts/clowder2/values.yaml

@@ -51,18 +51,6 @@ backend:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
-  env:
-    MINIO_SERVER_URL: clowder2-minio:9000
-    MINIO_SECURE: "true"
-    MINIO_UPLOAD_CHUNK_SIZE: "10485760"
-    MINIO_BUCKET_NAME: clowder
-    MONGODB_URL: mongodb://clowder2-mongodb:27017
-    oauth2_scheme_auth_url: http://clowder2-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code
-    auth_register_url: /keycloak/realms/clowder/protocol/openid-connect/registrations?client_id=clowder2-backend&response_type=code&redirect_uri=$(auth_redirect_uri)&scope=openid%20email
-    auth_token_url: http://clowder2-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/token
-    elasticsearch_url: http://clowder2-elasticsearch:9200
-    RABBITMQ_HOST: clowder2-rabbitmq
-    API_HOST: http://clowder2-backend:80
   service:
     type: ClusterIP
     port: 80
@@ -194,17 +182,11 @@ message:
   image:
     repository: clowder/clowder2-messages
     pullPolicy: Always
-  env:
-    MONGODB_URL: mongodb://clowder2-mongodb:27017
-    RABBITMQ_HOST: clowder2-rabbitmq
 
 heartbeat:
   image:
     repository: clowder/clowder2-heartbeat
     pullPolicy: Always
-  env:
-    MONGODB_URL: mongodb://clowder2-mongodb:27017
-    RABBITMQ_HOST: clowder2-rabbitmq
 
 ## list of extractors to be installed. Each extractor should have the
 ## following fields: