Skip to content

Commit 4e8bcf0

Browse files
authored
Merge pull request #10 from windmill-labs/revert-9-main
Revert "Use `{{ .Release.Name }}` in Kubernetes resource names"
2 parents f849531 + e714ea3 commit 4e8bcf0

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: {{ .Release.Name }}-configmap
4+
name: windmill-configmap
55
labels:
66
app: windmill
77
data:
88
oauth.json: |
99
{{ .Values.windmill.oauthConfig | indent 4}}
10+

charts/windmill/templates/deploy_lsp.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: {{ .Release.Name }}-lsp
4+
name: lsp
55
spec:
66
replicas: 2
77
strategy:
@@ -48,7 +48,7 @@ spec:
4848
apiVersion: v1
4949
kind: Service
5050
metadata:
51-
name: {{ .Release.Name }}-lsp
51+
name: windmill-lsp
5252
spec:
5353
externalTrafficPolicy: Cluster
5454
ports:

charts/windmill/templates/deploy_postgres.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
app: windmill
1111
template:
1212
metadata:
13-
labels:
13+
labels:
1414
app: windmill
1515
container: postgres
1616
spec:

charts/windmill/templates/deploy_windmill.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: {{ .Release.Name }}
4+
name: windmill
5+
56
spec:
67
replicas: {{ .Values.windmill.frontendReplicas }}
7-
strategy:
8+
strategy:
89
type: RollingUpdate
910
rollingUpdate:
1011
maxSurge: 3
@@ -17,7 +18,7 @@ spec:
1718
metadata:
1819
annotations:
1920
timestamp: {{ now | quote }}
20-
labels:
21+
labels:
2122
app: windmill-app
2223
container: windmill-app
2324
spec:
@@ -94,7 +95,7 @@ spec:
9495
apiVersion: v1
9596
kind: Service
9697
metadata:
97-
name: {{ .Release.Name }}-app
98+
name: windmill-app
9899
spec:
99100
externalTrafficPolicy: Cluster
100101
ports:

charts/windmill/templates/deploy_windmill_workers.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: {{ .Release.Name }}-workers
4+
name: windmill-workers
55
spec:
66
replicas: {{ .Values.windmill.workerReplicas }}
7-
strategy:
7+
strategy:
88
type: RollingUpdate
99
rollingUpdate:
1010
maxSurge: 3
@@ -14,7 +14,7 @@ spec:
1414
app: windmill-worker
1515
template:
1616
metadata:
17-
labels:
17+
labels:
1818
app: windmill-worker
1919
container: windmill-worker
2020
spec:
@@ -77,7 +77,7 @@ spec:
7777
apiVersion: v1
7878
kind: Service
7979
metadata:
80-
name: {{ .Release.Name }}-workers
80+
name: windmill-workers
8181
spec:
8282
externalTrafficPolicy: Cluster
8383
ports:
@@ -95,7 +95,7 @@ status:
9595
apiVersion: v1
9696
kind: Service
9797
metadata:
98-
name: {{ .Release.Name }}-worker-metrics
98+
name: windmill-worker-metrics
9999
spec:
100100
clusterIP: None
101101
ports:

0 commit comments

Comments
 (0)