Skip to content

Commit 6d9ae0c

Browse files
clyang82clyang82
committed
Test rosa and gcp
Signed-off-by: clyang82 <chuyang@redhat.com>
1 parent e3bf44a commit 6d9ae0c

File tree

15 files changed

+541
-361
lines changed

15 files changed

+541
-361
lines changed

‎charts/maestro-agent/templates/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
- --consumer-name={{ .Values.consumerName }}
3131
- --workload-source-driver={{ .Values.messageBroker.type }}
3232
- --workload-source-config=/secrets/{{ .Values.messageBroker.type }}/config.yaml
33-
- --cloudevents-client-id={{ .Values.consumerName }}-work-agent
33+
- --cloudevents-client-id={{ .Values.cloudeventsClientId }}
3434
- -v={{ .Values.logging.klogV }}
3535
volumeMounts:
3636
- name: {{ .Values.messageBroker.type }}

‎charts/maestro-agent/values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ installCRDs: true
1111
# Consumer name - identifies the agent/cluster
1212
consumerName: cluster1
1313

14+
# cloudevents client Id. in rosa, only consumer name is used to create certs
15+
cloudeventsClientId: cluster1-work-agent
16+
1417
# default client certificate refresh/reload duration for message broker
1518
clientCertRefreshDuration: 5m
1619

‎charts/maestro-server/templates/deployment.yaml‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ spec:
4747
secretName: maestro-grpc-broker-cert
4848
optional: true
4949
{{- end }}
50-
{{- if eq .Values.messageBroker.type "pubsub" }}
51-
- name: pubsub-creds
52-
secret:
53-
secretName: maestro-pubsub-creds
54-
optional: true
55-
{{- end }}
5650
{{- if .Values.server.https.enabled }}
5751
- name: https-certs
5852
secret:
@@ -74,8 +68,6 @@ spec:
7468
- "--structured-logs"
7569
- "--port=5432"
7670
- {{ .Values.database.cloudSqlProxy.instanceConnectionName | quote }}
77-
securityContext:
78-
runAsNonRoot: true
7971
{{- end }}
8072
- name: migration
8173
image: {{ include "maestro-server.image" . }}
@@ -116,10 +108,6 @@ spec:
116108
- name: grpc-broker-cert
117109
mountPath: /secrets/grpc-broker-cert
118110
{{- end }}
119-
{{- if eq .Values.messageBroker.type "pubsub" }}
120-
- name: pubsub-creds
121-
mountPath: /secrets/pubsub
122-
{{- end }}
123111
{{- if .Values.server.https.enabled }}
124112
- name: https-certs
125113
mountPath: /secrets/https-certs
@@ -163,10 +151,10 @@ spec:
163151
- --grpc-tls-key-file={{ .Values.server.grpc.tls.keyFile }}
164152
- --grpc-client-ca-file={{ .Values.server.grpc.tls.clientCAFile }}
165153
{{- end }}
166-
{{- if and (eq .Values.messageBroker.type "grpc") .Values.grpc.tls.enabled }}
167-
- --grpc-broker-tls-cert-file={{ .Values.grpc.tls.certFile }}
168-
- --grpc-broker-tls-key-file={{ .Values.grpc.tls.keyFile }}
169-
- --grpc-broker-client-ca-file={{ .Values.grpc.tls.clientCAFile }}
154+
{{- if and (eq .Values.messageBroker.type "grpc") .Values.messageBroker.grpc.tls.enabled }}
155+
- --grpc-broker-tls-cert-file={{ .Values.messageBroker.grpc.tls.certFile }}
156+
- --grpc-broker-tls-key-file={{ .Values.messageBroker.grpc.tls.keyFile }}
157+
- --grpc-broker-client-ca-file={{ .Values.messageBroker.grpc.tls.clientCAFile }}
170158
{{- end }}
171159
- --server-hostname={{ .Values.server.hostname }}
172160
- --http-server-bindport={{ .Values.server.http.bindPort }}

‎charts/maestro-server/templates/grpc.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (eq .Values.messageBroker.type "grpc") .Values.grpc.enabled -}}
1+
{{- if eq .Values.messageBroker.type "grpc" -}}
22
---
33
apiVersion: v1
44
kind: Secret
@@ -8,5 +8,5 @@ metadata:
88
{{- include "maestro-server.labels" . | nindent 4 }}
99
stringData:
1010
config.yaml: |
11-
url: {{ .Values.grpc.url }}
11+
url: {{ .Values.messageBroker.grpc.url }}
1212
{{- end }}

‎charts/maestro-server/templates/mosquitto.yaml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{{- if .Values.mosquitto.enabled -}}
2+
---
3+
apiVersion: v1
4+
kind: Service
5+
metadata:
6+
name: {{ .Values.mosquitto.service.name }}
7+
labels:
8+
{{- include "maestro-server.labels" . | nindent 4 }}
9+
annotations:
10+
template.openshift.io/expose-uri: tcp://{.spec.clusterIP}:{.spec.ports[?(.name==\mosquitto\)].port}
11+
spec:
12+
ports:
13+
- name: mosquitto
14+
protocol: TCP
15+
port: {{ .Values.mosquitto.service.port }}
16+
targetPort: {{ .Values.mosquitto.service.port }}
17+
selector:
18+
name: {{ .Values.mosquitto.service.name }}
19+
type: ClusterIP
20+
---
21+
apiVersion: apps/v1
22+
kind: Deployment
23+
metadata:
24+
name: {{ .Values.mosquitto.service.name }}
25+
labels:
26+
{{- include "maestro-server.labels" . | nindent 4 }}
27+
spec:
28+
replicas: 1
29+
selector:
30+
matchLabels:
31+
name: {{ .Values.mosquitto.service.name }}
32+
strategy:
33+
type: Recreate
34+
template:
35+
metadata:
36+
labels:
37+
name: {{ .Values.mosquitto.service.name }}
38+
spec:
39+
serviceAccountName: {{ include "maestro-server.serviceAccountName" . }}
40+
containers:
41+
- image: {{ .Values.mosquitto.image }}
42+
imagePullPolicy: IfNotPresent
43+
name: mosquitto
44+
ports:
45+
- containerPort: {{ .Values.mosquitto.service.port }}
46+
name: mosquitto
47+
volumeMounts:
48+
- name: mosquitto-persistent-storage
49+
mountPath: /mosquitto/data
50+
- name: mosquitto-config
51+
mountPath: /mosquitto/config/mosquitto.conf
52+
subPath: mosquitto.conf
53+
{{- if .Values.mosquitto.tls.enabled }}
54+
- name: mosquitto-certs
55+
mountPath: /mosquitto/certs
56+
readOnly: true
57+
{{- end }}
58+
volumes:
59+
- name: mosquitto-persistent-storage
60+
emptyDir: {}
61+
- name: mosquitto-config
62+
configMap:
63+
name: {{ .Values.mosquitto.service.name }}
64+
{{- if .Values.mosquitto.tls.enabled }}
65+
- name: mosquitto-certs
66+
secret:
67+
secretName: maestro-mqtt-certs
68+
{{- end }}
69+
---
70+
apiVersion: v1
71+
kind: ConfigMap
72+
metadata:
73+
name: {{ .Values.mosquitto.service.name }}
74+
labels:
75+
{{- include "maestro-server.labels" . | nindent 4 }}
76+
data:
77+
mosquitto.conf: |
78+
listener {{ .Values.mosquitto.service.port }} 0.0.0.0
79+
{{- if .Values.mosquitto.tls.enabled }}
80+
cafile /mosquitto/certs/ca.crt
81+
certfile /mosquitto/certs/server.crt
82+
keyfile /mosquitto/certs/server.key
83+
require_certificate true
84+
use_identity_as_username true
85+
{{- else }}
86+
allow_anonymous true
87+
{{- end }}
88+
{{- end }}

‎charts/maestro-server/templates/mqtt.yaml‎

Lines changed: 18 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,4 @@
1-
{{- if and (eq .Values.messageBroker.type "mqtt") .Values.mqtt.enabled -}}
2-
---
3-
apiVersion: v1
4-
kind: Service
5-
metadata:
6-
name: {{ .Values.mqtt.service.name }}
7-
labels:
8-
{{- include "maestro-server.labels" . | nindent 4 }}
9-
annotations:
10-
template.openshift.io/expose-uri: tcp://{.spec.clusterIP}:{.spec.ports[?(.name==\mosquitto\)].port}
11-
spec:
12-
ports:
13-
- name: mosquitto
14-
protocol: TCP
15-
port: {{ .Values.mqtt.service.port }}
16-
targetPort: {{ .Values.mqtt.service.port }}
17-
selector:
18-
name: {{ .Values.mqtt.service.name }}
19-
type: ClusterIP
20-
---
21-
apiVersion: apps/v1
22-
kind: Deployment
23-
metadata:
24-
name: {{ .Values.mqtt.service.name }}
25-
labels:
26-
{{- include "maestro-server.labels" . | nindent 4 }}
27-
spec:
28-
replicas: 1
29-
selector:
30-
matchLabels:
31-
name: {{ .Values.mqtt.service.name }}
32-
strategy:
33-
type: Recreate
34-
template:
35-
metadata:
36-
labels:
37-
name: {{ .Values.mqtt.service.name }}
38-
spec:
39-
serviceAccountName: {{ include "maestro-server.serviceAccountName" . }}
40-
containers:
41-
- image: {{ .Values.mqtt.image }}
42-
imagePullPolicy: IfNotPresent
43-
name: mosquitto
44-
ports:
45-
- containerPort: {{ .Values.mqtt.service.port }}
46-
name: mosquitto
47-
volumeMounts:
48-
- name: mosquitto-persistent-storage
49-
mountPath: /mosquitto/data
50-
- name: mosquitto-config
51-
mountPath: /mosquitto/config/mosquitto.conf
52-
subPath: mosquitto.conf
53-
{{- if .Values.mqtt.tls.enabled }}
54-
- name: mosquitto-certs
55-
mountPath: /mosquitto/certs
56-
readOnly: true
57-
{{- end }}
58-
volumes:
59-
- name: mosquitto-persistent-storage
60-
emptyDir: {}
61-
- name: mosquitto-config
62-
configMap:
63-
name: {{ .Values.mqtt.service.name }}
64-
{{- if .Values.mqtt.tls.enabled }}
65-
- name: mosquitto-certs
66-
secret:
67-
secretName: maestro-mqtt-certs
68-
{{- end }}
69-
---
70-
apiVersion: v1
71-
kind: ConfigMap
72-
metadata:
73-
name: {{ .Values.mqtt.service.name }}
74-
labels:
75-
{{- include "maestro-server.labels" . | nindent 4 }}
76-
data:
77-
mosquitto.conf: |
78-
listener {{ .Values.mqtt.service.port }} 0.0.0.0
79-
{{- if .Values.mqtt.tls.enabled }}
80-
cafile /mosquitto/certs/ca.crt
81-
certfile /mosquitto/certs/server.crt
82-
keyfile /mosquitto/certs/server.key
83-
require_certificate true
84-
use_identity_as_username true
85-
{{- else }}
86-
allow_anonymous true
87-
{{- end }}
1+
{{- if and (eq .Values.messageBroker.type "mqtt") .Values.messageBroker.secretName }}
882
---
893
apiVersion: v1
904
kind: Secret
@@ -94,19 +8,25 @@ metadata:
948
{{- include "maestro-server.labels" . | nindent 4 }}
959
stringData:
9610
config.yaml: |
97-
brokerHost: {{ .Values.mqtt.host }}:{{ .Values.mqtt.service.port }}
98-
{{- if .Values.mqtt.user }}
99-
username: {{ .Values.mqtt.user }}
11+
brokerHost: {{ .Values.messageBroker.mqtt.host }}:{{ .Values.messageBroker.mqtt.port }}
12+
{{- if .Values.messageBroker.mqtt.user }}
13+
username: {{ .Values.messageBroker.mqtt.user }}
10014
{{- end }}
101-
{{- if .Values.mqtt.password }}
102-
password: {{ .Values.mqtt.password }}
15+
{{- if .Values.messageBroker.mqtt.password }}
16+
password: {{ .Values.messageBroker.mqtt.password }}
10317
{{- end }}
104-
{{- if .Values.mqtt.tls.enabled }}
105-
caFile: {{ .Values.mqtt.tls.caFile }}
106-
clientCertFile: {{ .Values.mqtt.tls.clientCertFile }}
107-
clientKeyFile: {{ .Values.mqtt.tls.clientKeyFile }}
18+
{{- if .Values.messageBroker.mqtt.tls.enabled }}
19+
caFile: {{ .Values.messageBroker.mqtt.tls.caFile }}
20+
clientCertFile: {{ .Values.messageBroker.mqtt.tls.clientCertFile }}
21+
clientKeyFile: {{ .Values.messageBroker.mqtt.tls.clientKeyFile }}
10822
{{- end }}
23+
{{- if .Values.messageBroker.mqtt.topics }}
10924
topics:
110-
sourceEvents: sources/maestro/consumers/+/sourceevents
111-
agentEvents: {{ .Values.mqtt.agentTopic }}
25+
{{- if .Values.messageBroker.mqtt.topics.sourceEvents }}
26+
sourceEvents: {{ .Values.messageBroker.mqtt.topics.sourceEvents }}
27+
{{- end }}
28+
{{- if .Values.messageBroker.mqtt.topics.agentEvents }}
29+
agentEvents: {{ .Values.messageBroker.mqtt.topics.agentEvents }}
30+
{{- end }}
31+
{{- end }}
11232
{{- end }}

‎charts/maestro-server/templates/pubsub.yaml‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (eq .Values.messageBroker.type "pubsub") .Values.pubsub.enabled -}}
1+
{{- if eq .Values.messageBroker.type "pubsub" -}}
22
---
33
apiVersion: v1
44
kind: Secret
@@ -8,39 +8,25 @@ metadata:
88
{{- include "maestro-server.labels" . | nindent 4 }}
99
stringData:
1010
config.yaml: |
11-
{{- if .Values.pubsub.projectID }}
12-
projectID: {{ .Values.pubsub.projectID }}
11+
{{- if .Values.messageBroker.pubsub.projectID }}
12+
projectID: {{ .Values.messageBroker.pubsub.projectID }}
1313
{{- end }}
14-
{{- if .Values.pubsub.credentialsJSON }}
15-
credentialsFile: {{ .Values.pubsub.credentialsFile }}
16-
{{- end }}
17-
{{- if .Values.pubsub.topics }}
14+
{{- if .Values.messageBroker.pubsub.topics }}
1815
topics:
19-
{{- if .Values.pubsub.topics.sourceEvents }}
20-
sourceEvents: {{ .Values.pubsub.topics.sourceEvents }}
16+
{{- if .Values.messageBroker.pubsub.topics.sourceEvents }}
17+
sourceEvents: {{ .Values.messageBroker.pubsub.topics.sourceEvents }}
2118
{{- end }}
22-
{{- if .Values.pubsub.topics.sourceBroadcast }}
23-
sourceBroadcast: {{ .Values.pubsub.topics.sourceBroadcast }}
19+
{{- if .Values.messageBroker.pubsub.topics.sourceBroadcast }}
20+
sourceBroadcast: {{ .Values.messageBroker.pubsub.topics.sourceBroadcast }}
2421
{{- end }}
2522
{{- end }}
26-
{{- if .Values.pubsub.subscriptions }}
23+
{{- if .Values.messageBroker.pubsub.subscriptions }}
2724
subscriptions:
28-
{{- if .Values.pubsub.subscriptions.agentEvents }}
29-
agentEvents: {{ .Values.pubsub.subscriptions.agentEvents }}
25+
{{- if .Values.messageBroker.pubsub.subscriptions.agentEvents }}
26+
agentEvents: {{ .Values.messageBroker.pubsub.subscriptions.agentEvents }}
3027
{{- end }}
31-
{{- if .Values.pubsub.subscriptions.agentBroadcast }}
32-
agentBroadcast: {{ .Values.pubsub.subscriptions.agentBroadcast }}
28+
{{- if .Values.messageBroker.pubsub.subscriptions.agentBroadcast }}
29+
agentBroadcast: {{ .Values.messageBroker.pubsub.subscriptions.agentBroadcast }}
3330
{{- end }}
3431
{{- end }}
35-
---
36-
{{- if .Values.pubsub.credentialsJSON }}
37-
apiVersion: v1
38-
kind: Secret
39-
metadata:
40-
name: maestro-pubsub-creds
41-
labels:
42-
{{- include "maestro-server.labels" . | nindent 4 }}
43-
stringData:
44-
credentials.json: {{ .Values.pubsub.credentialsJSON | quote }}
45-
{{- end }}
4632
{{- end }}

0 commit comments

Comments
 (0)