Skip to content
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.

Sign up for GitHub

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

central admission slight refactor #1523

Merged
merged 1 commit into from
Feb 7, 2024
Merged

central admission slight refactor #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions charts/eks/templates/syncer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,14 @@ spec:
{{- if .Values.coredns.integrated }}
- --integrated-coredns=true
{{- end }}
{{- if .Values.admission.validatingWebhooks }}
{{- range .Values.admission.validatingWebhooks }}
- --enforce-validating-hook={{ . | b64enc }}
{{- if .Values.centralAdmission.validatingWebhooks }}
{{- range .Values.centralAdmission.validatingWebhooks }}
- --enforce-validating-hook={{ . | toYaml | b64enc }}
{{- end }}
{{- end }}
{{- if .Values.admission.mutatingWebhooks }}
{{- range .Values.admission.mutatingWebhooks }}
- --enforce-mutating-hook={{ . | b64enc }}
{{- if .Values.centralAdmission.mutatingWebhooks }}
{{- range .Values.centralAdmission.mutatingWebhooks }}
- --enforce-mutating-hook={{ . | toYaml | b64enc }}
{{- end }}
{{- end }}
{{- if and .Values.coredns.integrated .Values.coredns.plugin.enabled }}
Expand Down
2 changes: 1 addition & 1 deletion charts/eks/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ multiNamespaceMode:

# list of {validating/mutating}webhooks that the syncer should proxy.
# This is a PRO only feature.
admission:
centralAdmission:
validatingWebhooks: []
mutatingWebhooks: []

Expand Down
12 changes: 6 additions & 6 deletions charts/k0s/templates/syncer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,14 @@ spec:
{{- if and .Values.coredns.integrated .Values.coredns.plugin.enabled }}
- --use-coredns-plugin=true
{{- end }}
{{- if .Values.admission.validatingWebhooks }}
{{- range .Values.admission.validatingWebhooks }}
- --enforce-validating-hook={{ . | b64enc }}
{{- if .Values.centralAdmission.validatingWebhooks }}
{{- range .Values.centralAdmission.validatingWebhooks }}
- --enforce-validating-hook={{ . | toYaml | b64enc }}
{{- end }}
{{- end }}
{{- if .Values.admission.mutatingWebhooks }}
{{- range .Values.admission.mutatingWebhooks }}
- --enforce-mutating-hook={{ . | b64enc }}
{{- if .Values.centralAdmission.mutatingWebhooks }}
{{- range .Values.centralAdmission.mutatingWebhooks }}
- --enforce-mutating-hook={{ . | toYaml | b64enc }}
{{- end }}
{{- end }}
{{- range $f := .Values.syncer.extraArgs }}
Expand Down
2 changes: 1 addition & 1 deletion charts/k0s/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ multiNamespaceMode:

# list of {validating/mutating}webhooks that the syncer should proxy.
# This is a PRO only feature.
admission:
centralAdmission:
validatingWebhooks: []
mutatingWebhooks: []

Expand Down
12 changes: 6 additions & 6 deletions charts/k3s/templates/syncer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,14 @@ spec:
- --sync-k8s-service=true
{{- end }}
{{- end }}
{{- if .Values.admission.validatingWebhooks }}
{{- range .Values.admission.validatingWebhooks }}
- --enforce-validating-hook={{ . | b64enc }}
{{- if .Values.centralAdmission.validatingWebhooks }}
{{- range .Values.centralAdmission.validatingWebhooks }}
- --enforce-validating-hook={{ . | toYaml | b64enc }}
{{- end }}
{{- end }}
{{- if .Values.admission.mutatingWebhooks }}
{{- range .Values.admission.mutatingWebhooks }}
- --enforce-mutating-hook={{ . | b64enc }}
{{- if .Values.centralAdmission.mutatingWebhooks }}
{{- range .Values.centralAdmission.mutatingWebhooks }}
- --enforce-mutating-hook={{ . | toYaml | b64enc }}
{{- end }}
{{- end }}
{{- range $f := .Values.syncer.extraArgs }}
Expand Down
2 changes: 1 addition & 1 deletion charts/k3s/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ embeddedEtcd:

# list of {validating/mutating}webhooks that the syncer should proxy.
# This is a PRO only feature.
admission:
centralAdmission:
validatingWebhooks: []
mutatingWebhooks: []

Expand Down
12 changes: 6 additions & 6 deletions charts/k8s/templates/syncer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,14 +286,14 @@ spec:
{{- if and .Values.coredns.integrated .Values.coredns.plugin.enabled }}
- --use-coredns-plugin=true
{{- end }}
{{- if .Values.admission.validatingWebhooks }}
{{- range .Values.admission.validatingWebhooks }}
- --enforce-validating-hook={{ . | b64enc }}
{{- if .Values.centralAdmission.validatingWebhooks }}
{{- range .Values.centralAdmission.validatingWebhooks }}
- --enforce-validating-hook={{ . | toYaml | b64enc }}
{{- end }}
{{- end }}
{{- if .Values.admission.mutatingWebhooks }}
{{- range .Values.admission.mutatingWebhooks }}
- --enforce-mutating-hook={{ . | b64enc }}
{{- if .Values.centralAdmission.mutatingWebhooks }}
{{- range .Values.centralAdmission.mutatingWebhooks }}
- --enforce-mutating-hook={{ . | toYaml | b64enc }}
{{- end }}
{{- end }}
{{- range $f := .Values.syncer.extraArgs }}
Expand Down
2 changes: 1 addition & 1 deletion charts/k8s/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ multiNamespaceMode:

# list of {validating/mutating}webhooks that the syncer should proxy.
# This is a PRO only feature.
admission:
centralAdmission:
validatingWebhooks: []
mutatingWebhooks: []

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/loft-sh/api/v3 v3.0.0-20240202135831-33c4357035e6
github.com/loft-sh/loftctl/v3 v3.0.0-20240202135933-6548c1e817a7
github.com/loft-sh/utils v0.0.29
github.com/loft-sh/vcluster-values v0.0.0-20240202091012-8385efc731ba
github.com/loft-sh/vcluster-values v0.0.0-20240207073754-18fb56471594
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
github.com/mitchellh/go-homedir v1.1.0
github.com/moby/locker v1.0.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,8 +643,8 @@ github.com/loft-sh/log v0.0.0-20230824104949-bd516c25712a h1:/gqqjKpcHEdFXIX41lx
github.com/loft-sh/log v0.0.0-20230824104949-bd516c25712a/go.mod h1:YImeRjXH34Yf5E79T7UHBQpDZl9fIaaFRgyZ/bkY+UQ=
github.com/loft-sh/utils v0.0.29 h1:P/MObccXToAZy2QoJSQDJ+OJx1qHitpFHEVj3QBSNJs=
github.com/loft-sh/utils v0.0.29/go.mod h1:9hlX9cGpWHg3mNi/oBlv3X4ePGDMK66k8MbOZGFMDTI=
github.com/loft-sh/vcluster-values v0.0.0-20240202091012-8385efc731ba h1:0euB0vEWBPofSOtYnqbn6O2wNGYEklaz3vEzh0qgpag=
github.com/loft-sh/vcluster-values v0.0.0-20240202091012-8385efc731ba/go.mod h1:J34xtWyMbjM+NRgVWxO0IVDB5XYUaX52jPQNqEAhu4M=
github.com/loft-sh/vcluster-values v0.0.0-20240207073754-18fb56471594 h1:w98N8zTBD0Upvk1LPJFotq66ACFwiE9AgTuNyEkSGLk=
github.com/loft-sh/vcluster-values v0.0.0-20240207073754-18fb56471594/go.mod h1:J34xtWyMbjM+NRgVWxO0IVDB5XYUaX52jPQNqEAhu4M=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
Expand Down
6 changes: 3 additions & 3 deletions vendor/github.com/loft-sh/vcluster-values/helmvalues/common.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions vendor/github.com/loft-sh/vcluster-values/helmvalues/k0s.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ github.com/loft-sh/utils/pkg/command
github.com/loft-sh/utils/pkg/downloader
github.com/loft-sh/utils/pkg/downloader/commands
github.com/loft-sh/utils/pkg/extract
# github.com/loft-sh/vcluster-values v0.0.0-20240202091012-8385efc731ba
# github.com/loft-sh/vcluster-values v0.0.0-20240207073754-18fb56471594
## explicit; go 1.21.5
github.com/loft-sh/vcluster-values/helmvalues
github.com/loft-sh/vcluster-values/values
Expand Down
Loading