Skip to content

fix certgen job race condition #5082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions charts/gateway-helm/templates/certgen-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ metadata:
{{- if .Values.certgen.rbac.labels }}
{{- toYaml .Values.certgen.rbac.labels | nindent 4 }}
{{- end }}
annotations:
"helm.sh/hook": pre-install
{{- if .Values.certgen.rbac.annotations }}
annotations:
{{- toYaml .Values.certgen.rbac.annotations | nindent 4 -}}
{{- end }}
---
Expand All @@ -24,9 +23,8 @@ metadata:
{{- if .Values.certgen.rbac.labels }}
{{- toYaml .Values.certgen.rbac.labels | nindent 4 }}
{{- end }}
annotations:
"helm.sh/hook": pre-install
{{- if .Values.certgen.rbac.annotations }}
annotations:
{{- toYaml .Values.certgen.rbac.annotations | nindent 4 -}}
{{- end }}
rules:
Expand All @@ -49,9 +47,8 @@ metadata:
{{- if .Values.certgen.rbac.labels }}
{{- toYaml .Values.certgen.rbac.labels | nindent 4 }}
{{- end }}
annotations:
"helm.sh/hook": pre-install
{{- if .Values.certgen.rbac.annotations }}
annotations:
{{- toYaml .Values.certgen.rbac.annotations | nindent 4 -}}
{{- end }}
roleRef:
Expand Down
118 changes: 56 additions & 62 deletions test/helm/gateway-helm/certjen-custom-scheduling.out.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
---
# Source: gateway-helm/templates/envoy-gateway-serviceaccount.yaml
apiVersion: v1
kind: ServiceAccount
Expand Down Expand Up @@ -186,6 +199,28 @@ subjects:
name: 'envoy-gateway'
namespace: 'envoy-gateway-system'
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- create
- update
---
# Source: gateway-helm/templates/infra-manager-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down Expand Up @@ -280,6 +315,27 @@ rules:
- create
- patch
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: 'gateway-helm-certgen'
subjects:
- kind: ServiceAccount
name: 'gateway-helm-certgen'
namespace: 'envoy-gateway-system'
---
# Source: gateway-helm/templates/infra-manager-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand Down Expand Up @@ -456,68 +512,6 @@ spec:
secret:
secretName: envoy-gateway
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
annotations:
"helm.sh/hook": pre-install
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
annotations:
"helm.sh/hook": pre-install
rules:
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- create
- update
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
annotations:
"helm.sh/hook": pre-install
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: 'gateway-helm-certgen'
subjects:
- kind: ServiceAccount
name: 'gateway-helm-certgen'
namespace: 'envoy-gateway-system'
---
# Source: gateway-helm/templates/certgen.yaml
apiVersion: batch/v1
kind: Job
Expand Down
118 changes: 56 additions & 62 deletions test/helm/gateway-helm/control-plane-with-pdb.out.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@ spec:
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
---
# Source: gateway-helm/templates/envoy-gateway-serviceaccount.yaml
apiVersion: v1
kind: ServiceAccount
Expand Down Expand Up @@ -201,6 +214,28 @@ subjects:
name: 'envoy-gateway'
namespace: 'envoy-gateway-system'
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- create
- update
---
# Source: gateway-helm/templates/infra-manager-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand Down Expand Up @@ -295,6 +330,27 @@ rules:
- create
- patch
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: 'gateway-helm-certgen'
subjects:
- kind: ServiceAccount
name: 'gateway-helm-certgen'
namespace: 'envoy-gateway-system'
---
# Source: gateway-helm/templates/infra-manager-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand Down Expand Up @@ -471,68 +527,6 @@ spec:
secret:
secretName: envoy-gateway
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
annotations:
"helm.sh/hook": pre-install
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
annotations:
"helm.sh/hook": pre-install
rules:
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- create
- update
---
# Source: gateway-helm/templates/certgen-rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: gateway-helm-certgen
namespace: 'envoy-gateway-system'
labels:
helm.sh/chart: gateway-helm-v0.0.0-latest
app.kubernetes.io/name: gateway-helm
app.kubernetes.io/instance: gateway-helm
app.kubernetes.io/version: "latest"
app.kubernetes.io/managed-by: Helm
annotations:
"helm.sh/hook": pre-install
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: 'gateway-helm-certgen'
subjects:
- kind: ServiceAccount
name: 'gateway-helm-certgen'
namespace: 'envoy-gateway-system'
---
# Source: gateway-helm/templates/certgen.yaml
apiVersion: batch/v1
kind: Job
Expand Down
Loading
Loading