Skip to content

Commit 4d136e8

Browse files
longshuicylongshuicy
authored
1147 clowder 2 helm chart clean up (#1148)
* turn off unecessary ingress for minio and rabbitmq * remove default tls host * slight update the secret read * use the wrong secretname * add more gitignore * take out default extractors in the default values * allow backend env to be overwritten by value files with default * add quote to number and boolean * allow environment variable setting in heartbeat and message extractors * extractor doesn't need to be commented out; add message and heartbeat * use fullname for matching labels * typo * allow use existing secret and secret keys * duplicate rabbitmq pass
1 parent d655342 commit 4d136e8

File tree

13 files changed

+104
-52
lines changed

13 files changed

+104
-52
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ scripts/keycloak/data/*
5959
# ignore clowder chart deps
6060
deployments/kubernetes/charts/clowder2/charts
6161
deployments/kubernetes/charts/clowder2/*clowder2-software-dev.yaml
62+
*secret*.yaml
6263

6364
# Environments
6465
.env

‎deployments/kubernetes/charts/clowder2/templates/NOTES.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "clowder2.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
1616
echo http://$SERVICE_IP:{{ .Values.frontend.service.port }}
1717
{{- else if contains "ClusterIP" .Values.frontend.service.type }}
18-
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "clowder2.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
18+
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "clowder2.fullname" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
1919
export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
2020
echo "Visit http://127.0.0.1:8080 to use your application"
2121
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
4646
Selector labels
4747
*/}}
4848
{{- define "clowder2.selectorLabels" -}}
49-
app.kubernetes.io/name: {{ include "clowder2.name" . }}
49+
app.kubernetes.io/name: {{ include "clowder2.fullname" . }}
5050
app.kubernetes.io/instance: {{ .Release.Name }}
5151
{{- end }}
5252

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

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
{{- end }}
1111
selector:
1212
matchLabels:
13-
app.kubernetes.io/name: {{ include "clowder2.name" . }}-backend
13+
app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-backend
1414
app.kubernetes.io/instance: {{ .Release.Name }}
1515
template:
1616
metadata:
@@ -19,7 +19,7 @@ spec:
1919
{{- toYaml . | nindent 8 }}
2020
{{- end }}
2121
labels:
22-
app.kubernetes.io/name: {{ include "clowder2.name" . }}-backend
22+
app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-backend
2323
app.kubernetes.io/instance: {{ .Release.Name }}
2424
spec:
2525
{{- with .Values.imagePullSecrets }}
@@ -39,25 +39,31 @@ spec:
3939
- name: WEB_CONCURRENCY
4040
value: "1"
4141
- name: MINIO_SERVER_URL
42-
value: {{ include "clowder2.name" . }}-minio:9000
43-
# value: {{ include "clowder2.name" . }}-minio-headless:9000
42+
value: {{ .Values.backend.env.MINIO_SERVER_URL }}
4443
- name: MINIO_EXTERNAL_SERVER_URL
4544
value: minio-api.{{ .Values.hostname }}
4645
- name: MINIO_SECURE
47-
value: "true"
46+
value: {{ .Values.backend.env.MINIO_SECURE | quote }}
4847
- name: MINIO_BUCKET_NAME
49-
value: clowder
48+
value: {{ .Values.backend.env.MINIO_BUCKET_NAME }}
5049
- name: MINIO_ACCESS_KEY
5150
value: {{ .Values.minio.auth.rootUser }}
5251
- name: MINIO_SECRET_KEY
52+
{{- if .Values.backend.existingSecret }}
5353
valueFrom:
5454
secretKeyRef:
55-
name: clowder2-minio
55+
name: {{ .Values.backend.existingSecret }}
56+
key: {{ .Values.backend.existingMinioSecretKey | default "root-password" }}
57+
{{- else }}
58+
valueFrom:
59+
secretKeyRef:
60+
name: {{ include "clowder2.fullname" . }}-minio
5661
key: root-password
62+
{{- end }}
5763
- name: MINIO_UPLOAD_CHUNK_SIZE
58-
value: "10485760"
64+
value: {{ .Values.backend.env.MINIO_UPLOAD_CHUNK_SIZE | quote}}
5965
- name: MONGODB_URL
60-
value: mongodb://{{ include "clowder2.name" . }}-mongodb:27017
66+
value: {{ .Values.backend.env.MONGODB_URL }}
6167
- name: MONGO_DATABASE
6268
value: {{ .Values.mongodb.database }}
6369
- name: CLOWDER2_URL
@@ -73,37 +79,43 @@ spec:
7379
- name: auth_url
7480
value: $(CLOWDER2_URL)/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code
7581
- name: oauth2_scheme_auth_url
76-
value: http://{{ include "clowder2.name" .}}-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code
82+
value: {{ .Values.backend.env.oauth2_scheme_auth_url }}
7783
- name: auth_register_url
78-
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
84+
value: $(CLOWDER2_URL){{ .Values.backend.env.auth_register_url }}
7985
- name: auth_token_url
80-
value: http://{{ include "clowder2.name" .}}-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/token
86+
value: {{ .Values.backend.env.auth_token_url }}
8187
- name: auth_server_url
8288
value: $(CLOWDER2_URL)/keycloak/
8389
- name: keycloak_base
8490
value: $(CLOWDER2_URL)/api
8591
- name: frontend_url
8692
value: $(CLOWDER2_URL)
8793
- name: elasticsearch_url
88-
value: http://{{ include "clowder2.name" . }}-elasticsearch:9200
94+
value: {{ .Values.backend.env.elasticsearch_url }}
8995
- name: elasticsearch_no_of_shards
9096
value: "5"
9197
- name: elasticsearch_no_of_replicas
9298
value: "5"
9399
- name: RABBITMQ_USER
94100
value: {{ .Values.rabbitmq.auth.username }}
95101
- name: RABBITMQ_PASS
102+
{{- if .Values.backend.existingSecret }}
103+
valueFrom:
104+
secretKeyRef:
105+
name: {{ .Values.backend.existingSecret }}
106+
key: {{ .Values.backend.existingRabbitMQSecretKey | default "rabbitmq-password" }}
107+
{{- else }}
96108
valueFrom:
97109
secretKeyRef:
98-
name: clowder2-rabbitmq
110+
name: {{ include "clowder2.fullname" . }}-rabbitmq
99111
key: rabbitmq-password
112+
{{- end }}
100113
- name: RABBITMQ_HOST
101-
value: {{ include "clowder2.name" . }}-rabbitmq
114+
value: {{ .Values.backend.env.RABBITMQ_HOST }}
102115
- name: HEARTBEAT_EXCHANGE
103116
value: "extractors"
104117
- name: API_HOST
105-
# value: $(CLOWDER2_URL)
106-
value: http://{{ include "clowder2.name" . }}-backend:{{ .Values.backend.service.port }}
118+
value: {{ .Values.backend.env.API_HOST }}
107119
ports:
108120
- name: http
109121
containerPort: 80

‎deployments/kubernetes/charts/clowder2/templates/backend/ingress.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ spec:
2121
{{- if .Values.ingress.tls }}
2222
tls:
2323
- hosts:
24-
- {{ .Values.hostname }}
2524
{{- range .Values.ingress.tls }}
2625
{{- range .hosts }}
2726
- {{ . | quote }}

‎deployments/kubernetes/charts/clowder2/templates/extractors/deployment.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,17 @@ spec:
3838
- name: RABBITMQ_USER
3939
value: {{ $.Values.rabbitmq.auth.username }}
4040
- name: RABBITMQ_PASS
41+
{{- if $val.existingSecret }}
4142
valueFrom:
4243
secretKeyRef:
43-
name: clowder2-rabbitmq
44+
name: {{ $val.existingSecret }}
45+
key: {{ $val.existingRabbitMQSecretKey | default "rabbitmq-password" }}
46+
{{- else }}
47+
valueFrom:
48+
secretKeyRef:
49+
name: {{ $fullname }}-rabbitmq
4450
key: rabbitmq-password
51+
{{- end }}
4552
- name: CLOWDER_VERSION
4653
value: "2"
4754
- name: RABBITMQ_URI

‎deployments/kubernetes/charts/clowder2/templates/frontend/deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
{{- end }}
1111
selector:
1212
matchLabels:
13-
app.kubernetes.io/name: {{ include "clowder2.name" . }}-frontend
13+
app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-frontend
1414
app.kubernetes.io/instance: {{ .Release.Name }}
1515
template:
1616
metadata:
@@ -19,7 +19,7 @@ spec:
1919
{{- toYaml . | nindent 8 }}
2020
{{- end }}
2121
labels:
22-
app.kubernetes.io/name: {{ include "clowder2.name" . }}-frontend
22+
app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-frontend
2323
app.kubernetes.io/instance: {{ .Release.Name }}
2424
spec:
2525
{{- with .Values.imagePullSecrets }}

‎deployments/kubernetes/charts/clowder2/templates/frontend/ingress.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ spec:
2121
{{- if .Values.ingress.tls }}
2222
tls:
2323
- hosts:
24-
- {{ .Values.hostname }}
2524
{{- range .Values.ingress.tls }}
2625
{{- range .hosts }}
2726
- {{ . | quote }}

‎deployments/kubernetes/charts/clowder2/templates/geoserver/deployment.yaml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ spec:
99
replicas: {{ .Values.geoserver.replicaCount }}
1010
selector:
1111
matchLabels:
12-
app.kubernetes.io/name: {{ include "clowder2.name" . }}-geoserver
12+
app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-geoserver
1313
app.kubernetes.io/instance: {{ .Release.Name }}
1414
strategy:
1515
type: RollingUpdate
1616
template:
1717
metadata:
1818
labels:
19-
app.kubernetes.io/name: {{ include "clowder2.name" . }}-geoserver
19+
app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-geoserver
2020
app.kubernetes.io/instance: {{ .Release.Name }}
2121
spec:
2222
{{- with .Values.imagePullSecrets }}
@@ -29,15 +29,19 @@ spec:
2929
imagePullPolicy: {{ .Values.geoserver.image.pullPolicy }}
3030
env:
3131
- name: GEOSERVER_ADMIN_USER
32+
value: {{ .Values.geoserver.username }}
33+
- name: GEOSERVER_ADMIN_PASSWORD
34+
{{- if .Values.geoserver.existingSecret }}
3235
valueFrom:
3336
secretKeyRef:
34-
name: {{ include "clowder2.fullname" . }}-services
35-
key: GEOSERVER_USER
36-
- name: GEOSERVER_ADMIN_PASSWORD
37+
name: {{.Values.geoserver.existingSecret }}
38+
key: {{.Values.geoserver.existingGeoserverSecretKey | default "GEOSERVER_PW" }}
39+
{{- else }}
3740
valueFrom:
3841
secretKeyRef:
39-
name: {{ include "clowder2.fullname" . }}-services
42+
name: {{include "clowder2.fullname" . }}-services
4043
key: GEOSERVER_PW
44+
{{- end }}
4145
ports:
4246
- containerPort: 8080
4347
name: geoserver

‎deployments/kubernetes/charts/clowder2/templates/geoserver/service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ spec:
1313
targetPort: geoserver
1414
protocol: TCP
1515
selector:
16-
app.kubernetes.io/name: {{ include "clowder2.name" . }}-geoserver
16+
app.kubernetes.io/name: {{ include "clowder2.fullname" . }}-geoserver
1717
app.kubernetes.io/instance: {{ .Release.Name }}
1818
{{- end }}

0 commit comments

Comments
 (0)