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

Jump to bottom

Vendor gardener@1.54.0 and Handle PodDisruptionBudget policy/v1 #126

Merged
merged 3 commits into from
Sep 2, 2022
Merged

Vendor gardener@1.54.0 and Handle PodDisruptionBudget policy/v1 #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b4e923
Handle PodDisruptionBudget policy/v1
shafeeqes Sep 1, 2022
09498ec
Vendor `gardener@1.54`
shafeeqes Sep 1, 2022
ece5c88
Switch container registry from k8s.gcr.io to registry.k8s.io
shafeeqes Sep 1, 2022
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
1 change: 1 addition & 0 deletions charts/gardener-extension-admission-cilium/charts/runtime/charts/utils-templates
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../utils-templates
2 changes: 1 addition & 1 deletion charts/gardener-extension-admission-cilium/charts/runtime/templates/poddisruptionbudget.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if gt (int .Values.global.replicaCount) 1 }}
apiVersion: policy/v1beta1
apiVersion: {{ include "poddisruptionbudgetversion" . }}
kind: PodDisruptionBudget
metadata:
name: {{ include "name" . }}
Expand Down
4 changes: 2 additions & 2 deletions charts/images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ images:
tag: v0.1.8
- name: kube-proxy
sourceRepository: github.com/kubernetes/kubernetes
repository: k8s.gcr.io/hyperkube
repository: registry.k8s.io/hyperkube
targetVersion: "< 1.17"
- name: kube-proxy
sourceRepository: github.com/kubernetes/kubernetes
repository: k8s.gcr.io/kube-proxy
repository: registry.k8s.io/kube-proxy
targetVersion: ">= 1.17"
4 changes: 4 additions & 0 deletions charts/utils-templates/templates/_versions.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@ admissionregistration.k8s.io/v1beta1
{{- end -}}

{{- define "poddisruptionbudgetversion" -}}
{{- if semverCompare ">= 1.21-0" .Capabilities.KubeVersion.GitVersion -}}
policy/v1
{{- else -}}
policy/v1beta1
{{- end -}}
{{- end -}}

{{- define "podsecuritypolicyversion" -}}
policy/v1beta1
Expand Down
52 changes: 25 additions & 27 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ go 1.18

require (
github.com/ahmetb/gen-crd-api-reference-docs v0.2.0
github.com/gardener/gardener v1.52.2
github.com/gardener/gardener v1.54.0
github.com/go-logr/logr v1.2.3
github.com/golang/mock v1.6.0
github.com/onsi/ginkgo/v2 v2.1.4
github.com/onsi/gomega v1.19.0
github.com/onsi/gomega v1.20.0
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
golang.org/x/tools v0.1.10
k8s.io/api v0.24.3
k8s.io/apimachinery v0.24.3
golang.org/x/tools v0.1.12
k8s.io/api v0.24.4
k8s.io/apimachinery v0.24.4
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/code-generator v0.24.3
k8s.io/component-base v0.24.3
k8s.io/code-generator v0.24.4
k8s.io/component-base v0.24.4
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
sigs.k8s.io/controller-runtime v0.12.1
)
Expand All @@ -41,8 +41,7 @@ require (
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/gardener/etcd-druid v0.9.0 // indirect
github.com/gardener/external-dns-management v0.7.18 // indirect
github.com/gardener/etcd-druid v0.12.3 // indirect
github.com/gardener/hvpa-controller/api v0.5.0 // indirect
github.com/gardener/machine-controller-manager v0.45.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
Expand All @@ -58,7 +57,7 @@ require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.7 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.1.2 // indirect
Expand Down Expand Up @@ -106,34 +105,33 @@ require (
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
istio.io/api v0.0.0-20220512181135-e8ec1e1d89de // indirect
istio.io/client-go v1.14.0 // indirect
k8s.io/apiextensions-apiserver v0.24.3 // indirect
k8s.io/apiserver v0.24.3 // indirect
k8s.io/apiextensions-apiserver v0.24.4 // indirect
k8s.io/apiserver v0.24.4 // indirect
k8s.io/autoscaler/vertical-pod-autoscaler v0.11.0 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/helm v2.16.1+incompatible // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/kube-aggregator v0.24.3 // indirect
k8s.io/kube-aggregator v0.24.4 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/metrics v0.24.3 // indirect
k8s.io/metrics v0.24.4 // indirect
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220613074012-11e533d55213 // indirect
sigs.k8s.io/controller-tools v0.9.0 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
Expand All @@ -143,16 +141,16 @@ require (

replace (
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.12.1 // keep this value in sync with sigs.k8s.io/controller-runtime
k8s.io/api => k8s.io/api v0.24.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.3
k8s.io/apimachinery => k8s.io/apimachinery v0.24.3
k8s.io/apiserver => k8s.io/apiserver v0.24.3
k8s.io/api => k8s.io/api v0.24.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.4
k8s.io/apimachinery => k8s.io/apimachinery v0.24.4
k8s.io/apiserver => k8s.io/apiserver v0.24.4
k8s.io/autoscaler => k8s.io/autoscaler v0.0.0-20220531185024-cc90d57b7fe1 // translates to k8s.io/autoscaler/vertical-pod-autoscaler@v0.11.0
k8s.io/autoscaler/vertical-pod-autoscaler => k8s.io/autoscaler/vertical-pod-autoscaler v0.11.0
k8s.io/client-go => k8s.io/client-go v0.24.3
k8s.io/code-generator => k8s.io/code-generator v0.24.3
k8s.io/component-base => k8s.io/component-base v0.24.3
k8s.io/client-go => k8s.io/client-go v0.24.4
k8s.io/code-generator => k8s.io/code-generator v0.24.4
k8s.io/component-base => k8s.io/component-base v0.24.4
k8s.io/helm => k8s.io/helm v2.16.1+incompatible
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.4
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.12.1
)
Loading