Skip to content

Commit 972ab68

Browse files
nanjiangshunanjiangshu
authored
Merge pull request #291 from neicnordic/chart_hotfix
[hotfix] [charts]
2 parents 8ecf9b5 + 7b1b186 commit 972ab68

File tree

15 files changed

+36
-26
lines changed

15 files changed

+36
-26
lines changed

‎.github/integration/postgres.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
condition: service_healthy
2323
environment:
2424
- PGPASSWORD=rootpasswd
25-
image: ubuntu:kinetic
25+
image: ubuntu:jammy
2626
volumes:
2727
- ./scripts:/scripts
2828

@@ -82,7 +82,7 @@ services:
8282
condition: service_healthy
8383
environment:
8484
- PGPASSWORD=rootpasswd
85-
image: ubuntu:kinetic
85+
image: ubuntu:jammy
8686
profiles:
8787
- tests
8888
volumes:

‎.github/integration/scripts/charts/deploy_charts.sh‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
#!/bin/bash
22
set -ex
33

4-
if [ -z "$2" ];then
4+
if [ -z "$2" ]; then
55
echo "PR number missing"
66
exit 1
77
fi
88

9+
MQ_PORT=5672
10+
if [ "$3" == "true" ]; then
11+
MQ_PORT=5671
12+
fi
13+
914
if [ "$1" == "sda-db" ]; then
1015
ROOTPASS=$(yq e '.global.db.password' .github/integration/scripts/charts/values.yaml)
1116
helm install postgres charts/sda-db \
1217
--set image.tag="PR$2-postgres" \
1318
--set image.pullPolicy=IfNotPresent \
1419
--set global.postgresAdminPassword="$ROOTPASS" \
15-
--set global.tls.enabled=false \
20+
--set global.tls.clusterIssuer=cert-issuer \
21+
--set global.tls.enabled="$3" \
1622
--set persistence.enabled=false \
1723
--set resources=null \
1824
--wait
@@ -25,7 +31,8 @@ if [ "$1" == "sda-mq" ]; then
2531
--set image.pullPolicy=IfNotPresent \
2632
--set global.adminPassword="$ADMINPASS" \
2733
--set global.adminUser=admin \
28-
--set global.tls.enabled=false \
34+
--set global.tls.enabled="$3" \
35+
--set global.tls.clusterIssuer=cert-issuer \
2936
--set persistence.enabled=false \
3037
--set resources=null \
3138
--wait
@@ -35,6 +42,8 @@ if [ "$1" == "sda-svc" ]; then
3542
helm install pipeline charts/sda-svc \
3643
--set image.tag="PR$2" \
3744
--set image.pullPolicy=IfNotPresent \
45+
--set global.tls.enabled="$3" \
46+
--set global.broker.port="$MQ_PORT" \
3847
-f .github/integration/scripts/charts/values.yaml \
3948
--wait
4049
fi

‎.github/integration/scripts/charts/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ global:
1010
level: "debug"
1111
tls:
1212
enabled: false
13-
issuer: "cert-issuer"
14-
clusterIssuer: ""
13+
issuer: ""
14+
clusterIssuer: "cert-issuer"
1515
archive:
1616
s3Url: "http://minio.minio"
1717
s3Bucket: "archive"

‎.github/integration/sda-integration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
condition: service_healthy
1212
environment:
1313
- PGPASSWORD=rootpasswd
14-
image: ubuntu:kinetic
14+
image: ubuntu:jammy
1515
volumes:
1616
- ./scripts:/scripts
1717
- shared:/shared

‎.github/workflows/build_pr_container.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ jobs:
247247
strategy:
248248
matrix:
249249
version: ["1.26", "1.27"]
250+
tls: ["true", "false"]
250251
steps:
251252
- name: Checkout
252253
uses: actions/checkout@v4
@@ -270,14 +271,14 @@ jobs:
270271
shell: bash
271272

272273
- name: Deploy DB
273-
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-db ${{ github.event.number }}
274+
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-db ${{ github.event.number }} ${{matrix.tls}}
274275

275276
- name: Deploy MQ
276-
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-mq ${{ github.event.number }}
277+
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-mq ${{ github.event.number }} ${{matrix.tls}}
277278
shell: bash
278279

279280
- name: Deploy pipeline
280-
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-svc ${{ github.event.number }}
281+
run: bash .github/integration/scripts/charts/deploy_charts.sh sda-svc ${{ github.event.number }} ${{matrix.tls}}
281282
shell: bash
282283

283284
- name: test

‎charts/sda-mq/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: sda-mq
3-
version: "0.5.0"
3+
version: "0.5.1"
44
description: RabbitMQ component for Sensitive Data Archive (SDA) installation
55
home: https://neic-sda.readthedocs.io
66
icon: https://neic.no/assets/images/logo.png

‎charts/sda-mq/templates/statefulset.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ spec:
8080
key: shovel_connection
8181
{{- end }}
8282
{{- if .Values.global.tls.enabled }}
83-
- name: MQ_SERVER_CERT
83+
- name: RABBITMQ_SERVER_CERT
8484
value: {{ template "mqCert" . }}
85-
- name: MQ_SERVER_KEY
85+
- name: RABBITMQ_SERVER_KEY
8686
value: {{ template "mqKey" . }}
8787
{{- if .Values.global.tls.verifyPeer }}
88-
- name: MQ_CA
88+
- name: RABBITMQ_SERVER_CACERT
8989
value: {{ template "caCert" . }}
90-
- name: MQ_VERIFY
90+
- name: RABBITMQ_SERVER_VERIFY
9191
value: {{ template "verifyPeer" . }}
9292
{{- end }}
9393
{{- end }}
@@ -107,7 +107,7 @@ spec:
107107
- /bin/bash
108108
- -ec
109109
- rabbitmq-diagnostics -q ping
110-
initialDelaySeconds: 20
110+
initialDelaySeconds: 60
111111
periodSeconds: 10
112112
timeoutSeconds: 3
113113
readinessProbe:
@@ -117,7 +117,7 @@ spec:
117117
- -ec
118118
- rabbitmq-diagnostics -q check_running && rabbitmq-diagnostics -q check_local_alarms
119119
initialDelaySeconds: 30
120-
periodSeconds: 10
120+
periodSeconds: 5
121121
timeoutSeconds: 3
122122
volumeMounts:
123123
- name: data

‎charts/sda-svc/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: sda-svc
3-
version: "0.20.0"
3+
version: "0.20.1"
44
kubeVersion: ">= 1.19.0-0"
55
description: Components for Sensitive Data Archive (SDA) installation
66
home: https://neic-sda.readthedocs.io

‎charts/sda-svc/templates/backup-deploy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ spec:
145145
value: {{ .Values.global.broker.host | quote }}
146146
- name: BROKER_SSL
147147
value: {{ .Values.global.tls.enabled | quote }}
148-
{{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
148+
{{- if .Values.global.tls.enabled }}
149149
- name: BROKER_VERIFYPEER
150150
value: {{ .Values.global.broker.verifyPeer | quote }}
151151
- name: BROKER_CACERT

‎charts/sda-svc/templates/finalize-deploy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ spec:
8888
value: {{ .Values.global.broker.host | quote }}
8989
- name: BROKER_SSL
9090
value: {{ .Values.global.tls.enabled | quote }}
91-
{{- if and .Values.global.broker.ssl .Values.global.tls.enabled }}
91+
{{- if .Values.global.tls.enabled }}
9292
- name: BROKER_VERIFYPEER
9393
value: {{ .Values.global.broker.verifyPeer | quote }}
9494
- name: BROKER_CACERT

0 commit comments

Comments
 (0)