Skip to content

Commit 72f1963

Browse files
coding-huicoding-hui
committed
update iam helm
1 parent ea18558 commit 72f1963

File tree

9 files changed

+76
-278
lines changed

9 files changed

+76
-278
lines changed

‎installer/helm/iam/templates/apiserver/deployment.yaml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,24 @@ spec:
4242
imagePullPolicy: {{ .Values.apiServer.image.pullPolicy }}
4343
ports:
4444
- name: http
45-
containerPort: {{ .Values.apiServer.service.port }}
45+
containerPort: {{ .Values.apiServer.service.ports.http }}
46+
protocol: TCP
47+
- name: https
48+
containerPort: {{ .Values.apiServer.service.ports.https }}
49+
protocol: TCP
50+
- name: grpc
51+
containerPort: {{ .Values.apiServer.service.ports.grpc }}
4652
protocol: TCP
4753
readinessProbe:
4854
httpGet:
4955
path: /healthz
50-
port: {{ .Values.apiServer.service.port }}
56+
port: {{ .Values.apiServer.service.ports.http }}
5157
initialDelaySeconds: 15
5258
timeoutSeconds: 1
5359
livenessProbe:
5460
httpGet:
5561
path: /healthz
56-
port: {{ .Values.apiServer.service.port }}
62+
port: {{ .Values.apiServer.service.ports.http }}
5763
initialDelaySeconds: 30
5864
securityContext:
5965
{{- toYaml .Values.apiServer.containerSecurityContext | nindent 12 }}
@@ -84,7 +90,7 @@ spec:
8490
- name: iam-certs
8591
secret:
8692
defaultMode: 420
87-
secretName: {{ include "iam.apiServerFullname" . }}
93+
secretName: {{ include "iam.fullname" . }}
8894
- name: config
8995
configMap:
9096
name: {{ include "iam.apiServerFullname" . }}

‎installer/helm/iam/templates/apiserver/service.yaml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,26 @@ spec:
2828
{{- end }}
2929
ports:
3030
- name: http
31-
port: {{ .Values.apiServer.service.port }}
31+
port: {{ .Values.apiServer.service.ports.http }}
3232
targetPort: http
33-
{{- if and (eq "NodePort" .Values.apiServer.service.type) .Values.apiServer.service.nodePort }}
34-
nodePort: {{ .Values.apiServer.service.nodePort }}
33+
{{- if (and (or (eq .Values.apiServer.service.type "NodePort") (eq .Values.apiServer.service.type "LoadBalancer")) (not (empty .Values.apiServer.service.nodePorts.http))) }}
34+
nodePort: {{ .Values.apiServer.service.nodePorts.http }}
3535
{{- end }}
3636
protocol: TCP
37-
{{- with .Values.apiServer.service.appProtocol }}
38-
appProtocol: {{ . }}
37+
- name: https
38+
port: {{ .Values.apiServer.service.ports.https }}
39+
targetPort: https
40+
{{- if (and (or (eq .Values.apiServer.service.type "NodePort") (eq .Values.apiServer.service.type "LoadBalancer")) (not (empty .Values.apiServer.service.nodePorts.https))) }}
41+
nodePort: {{ .Values.apiServer.service.nodePorts.https }}
3942
{{- end }}
43+
protocol: TCP
44+
- name: grpc
45+
port: {{ .Values.apiServer.service.ports.grpc }}
46+
targetPort: https
47+
{{- if (and (or (eq .Values.apiServer.service.type "NodePort") (eq .Values.apiServer.service.type "LoadBalancer")) (not (empty .Values.apiServer.service.nodePorts.grpc))) }}
48+
nodePort: {{ .Values.apiServer.service.nodePorts.grpc }}
49+
{{- end }}
50+
protocol: TCP
4051
selector:
4152
{{- include "iam.apiServerSelectorLabels" . | nindent 4 }}
4253
{{- end }}

‎installer/helm/iam/templates/authzserver/batch-job.yaml‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎installer/helm/iam/templates/authzserver/deployment.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,21 @@ spec:
4242
imagePullPolicy: {{ .Values.authzServer.image.pullPolicy }}
4343
ports:
4444
- name: http
45-
containerPort: {{ .Values.authzServer.service.port }}
45+
containerPort: {{ .Values.authzServer.service.ports.http }}
46+
protocol: TCP
47+
- name: https
48+
containerPort: {{ .Values.authzServer.service.ports.https }}
4649
protocol: TCP
4750
readinessProbe:
4851
httpGet:
4952
path: /healthz
50-
port: {{ .Values.authzServer.service.port }}
53+
port: {{ .Values.authzServer.service.ports.http }}
5154
initialDelaySeconds: 15
5255
timeoutSeconds: 1
5356
livenessProbe:
5457
httpGet:
5558
path: /healthz
56-
port: {{ .Values.authzServer.service.port }}
59+
port: {{ .Values.authzServer.service.ports.http }}
5760
initialDelaySeconds: 30
5861
securityContext:
5962
{{- toYaml .Values.authzServer.containerSecurityContext | nindent 12 }}
@@ -84,7 +87,7 @@ spec:
8487
- name: iam-certs
8588
secret:
8689
defaultMode: 420
87-
secretName: {{ include "iam.authzServerFullname" . }}
90+
secretName: {{ include "iam.fullname" . }}
8891
- name: config
8992
configMap:
9093
name: {{ include "iam.authzServerFullname" . }}

‎installer/helm/iam/templates/authzserver/service.yaml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,19 @@ spec:
2828
{{- end }}
2929
ports:
3030
- name: http
31-
port: {{ .Values.authzServer.service.port }}
31+
port: {{ .Values.authzServer.service.ports.http }}
3232
targetPort: http
33-
{{- if and (eq "NodePort" .Values.authzServer.service.type) .Values.authzServer.service.nodePort }}
34-
nodePort: {{ .Values.authzServer.service.nodePort }}
33+
{{- if (and (or (eq .Values.authzServer.service.type "NodePort") (eq .Values.authzServer.service.type "LoadBalancer")) (not (empty .Values.authzServer.service.nodePorts.http))) }}
34+
nodePort: {{ .Values.authzServer.service.nodePorts.http }}
3535
{{- end }}
3636
protocol: TCP
37-
{{- with .Values.authzServer.service.appProtocol }}
38-
appProtocol: {{ . }}
37+
- name: https
38+
port: {{ .Values.authzServer.service.ports.https }}
39+
targetPort: https
40+
{{- if (and (or (eq .Values.authzServer.service.type "NodePort") (eq .Values.authzServer.service.type "LoadBalancer")) (not (empty .Values.authzServer.service.nodePorts.https))) }}
41+
nodePort: {{ .Values.authzServer.service.nodePorts.https }}
3942
{{- end }}
43+
protocol: TCP
4044
selector:
4145
{{- include "iam.authzServerSelectorLabels" . | nindent 4 }}
4246
{{- end }}

installer/helm/iam/templates/apiserver/batch-job.yaml renamed to installer/helm/iam/templates/batch-job.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
apiVersion: batch/v1
33
kind: Job
44
metadata:
5-
name: {{ include "iam.apiServerFullname" . }}-init
5+
name: {{ include "iam.fullname" . }}-init
66
labels:
7-
{{- include "iam.apiServerLabels" . | nindent 4 }}
7+
{{- include "iam.labels" . | nindent 4 }}
88
spec:
99
backoffLimit: 3
1010
template:
1111
spec:
12-
serviceAccountName: {{ include "iam.apiServerFullname" . }}
12+
serviceAccountName: {{ include "iam.fullname" . }}
1313
priorityClassName: system-cluster-critical
1414
{{- with .Values.global.imagePullSecrets }}
1515
imagePullSecrets:
@@ -20,6 +20,6 @@ spec:
2020
- name: main
2121
image: "{{ .Values.apiServer.image.repository }}:{{ .Values.apiServer.image.tag | default .Chart.AppVersion }}"
2222
imagePullPolicy: {{ .Values.apiServer.image.pullPolicy }}
23-
command: [ "/gen-k8s-secret.sh", "--service", "{{ include "iam.apiServerFullname" . }}", "--namespace",
24-
"{{ .Release.Namespace }}", "--secret", "{{ include "iam.apiServerFullname" . }}" ]
23+
command: [ "/gen-k8s-secret.sh", "--service", "{{ include "iam.fullname" . }}", "--namespace",
24+
"{{ .Release.Namespace }}", "--secret", "{{ include "iam.fullname" . }}" ]
2525
{{- end }}

‎installer/helm/iam/templates/serviceaccount.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: {{ include "iam.fullname" . }}
5+
namespace: {{ .Release.Namespace }}

‎installer/helm/iam/values-prod.yaml‎

Lines changed: 0 additions & 200 deletions
This file was deleted.

0 commit comments

Comments
 (0)