Merge pull request #210 from shafeeqes/vendor/gardener

Vendor `gardener@1.54.0` and Handle `PodDisruptionBudget` `policy/v1`

charts/gardener-extension-admission-calico/charts/runtime/charts/utils-templates

@@ -0,0 +1 @@
+../../../../utils-templates

charts/gardener-extension-admission-calico/charts/runtime/templates/poddisruptionbudget.yaml

@@ -1,5 +1,5 @@
 {{- if gt (int .Values.global.replicaCount) 1 }}
-apiVersion: policy/v1beta1
+apiVersion: {{ include "poddisruptionbudgetversion" .}}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "name" . }}

charts/images.yaml

@@ -57,9 +57,9 @@ images:
   # targetVersion: "< 1.21"
 - name: calico-cpa
   sourceRepository: github.com/kubernetes-sigs/cluster-proportional-autoscaler
-  repository: k8s.gcr.io/cpa/cluster-proportional-autoscaler
+  repository: registry.k8s.io/cpa/cluster-proportional-autoscaler
   tag: 1.8.6
 - name: calico-cpva
   sourceRepository: github.com/kubernetes-sigs/cluster-proportional-vertical-autoscaler
-  repository: k8s.gcr.io/cpa/cpvpa
+  repository: registry.k8s.io/cpa/cpvpa
   tag: v0.8.4

charts/utils-templates/templates/_versions.tpl

@@ -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

go.mod

@@ -4,19 +4,19 @@ go 1.18
 
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.2.0
-	github.com/gardener/gardener v1.52.0
+	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/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/helm v2.16.1+incompatible
 	sigs.k8s.io/controller-runtime v0.12.1
 )
@@ -39,8 +39,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
@@ -56,7 +55,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-20210407192527-94a9f03dee38 // indirect
 	github.com/google/uuid v1.1.2 // indirect
@@ -104,33 +103,32 @@ 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.2 // 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/klog v1.0.0 // indirect
 	k8s.io/klog/v2 v2.60.1 // indirect
-	k8s.io/kube-aggregator v0.24.2 // indirect
+	k8s.io/kube-aggregator v0.24.4 // indirect
 	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
-	k8s.io/metrics v0.24.2 // indirect
+	k8s.io/metrics v0.24.4 // indirect
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
 	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220613074012-11e533d55213 // indirect
 	sigs.k8s.io/controller-tools v0.9.0 // indirect
@@ -140,16 +138,16 @@ require (
 )
 
 replace (
-	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
 )