Skip to content

Commit

Permalink
Bump github.com/gardener/gardener from 1.100.1 to 1.102.0 (#243)
Browse files Browse the repository at this point in the history 
* Bump github.com/gardener/gardener from 1.100.1 to 1.102.0

Bumps [github.com/gardener/gardener](https://github.com/gardener/gardener) from 1.100.1 to 1.102.0.
- [Release notes](https://github.com/gardener/gardener/releases)
- [Commits](gardener/gardener@v1.100.1...v1.102.0)

---
updated-dependencies:
- dependency-name: github.com/gardener/gardener
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Adapt code to changes in new gardener version:
- add `class` field (gardener/gardener#10254)
- use `CloudProfile` (gardener/gardener#10093)
- copy `.ci/third_party/component_descriptor` (gardener/gardener#10218)
- replace local IPs (gardener/gardener#10019)
- fix `imagevector.WithEnvOverrid` (gardener/gardener#10218)
- fix `ForceDeleteShootAndWaitForDeletion` (gardener/gardener#10220)

* Address PR review feedback

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dimitar Kostadinov <[email protected]>
  • Loading branch information
@dependabot @dimitar-kostadinov
dependabot[bot] and dimitar-kostadinov authored Aug 27, 2024
1 parent 2cae14e commit 4732ba9
Show file tree
Hide file tree
Showing 8 changed files with 112 additions and 110 deletions.
4 changes: 3 additions & 1 deletion .ci/third_party/component_descriptor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ if [[ -f "$repo_root_dir/charts/images.yaml" ]]; then
image_vector_path="$repo_root_dir/charts/images.yaml"
elif [[ -f "$repo_root_dir/imagevector/images.yaml" ]]; then
image_vector_path="$repo_root_dir/imagevector/images.yaml"
elif [[ -f "$repo_root_dir/imagevector/containers.yaml" ]]; then
image_vector_path="$repo_root_dir/imagevector/containers.yaml"
fi

if [[ ! -z "$image_vector_path" ]]; then
Expand All @@ -72,7 +74,7 @@ if [[ ! -z "$image_vector_path" ]]; then
"
fi

# translates all images defined the images.yaml into component descriptor resources.
# translates all images defined the containers.yaml into component descriptor resources.
# For detailed documentation see https://github.com/gardener/component-cli/blob/main/docs/reference/components-cli_image-vector_add.md
component-cli image-vector add ${COMPONENT_CLI_ARGS}
fi
Expand Down
4 changes: 3 additions & 1 deletion cmd/gardener-extension-registry-cache/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
heartbeatcontroller "github.com/gardener/gardener/extensions/pkg/controller/heartbeat"
"github.com/gardener/gardener/extensions/pkg/util"
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
gardenerhealthz "github.com/gardener/gardener/pkg/healthz"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
monitoringv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1"
Expand All @@ -19,6 +20,7 @@ import (
componentbaseconfig "k8s.io/component-base/config"
"k8s.io/component-base/version"
"k8s.io/component-base/version/verflag"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
Expand Down Expand Up @@ -106,7 +108,7 @@ func (o *Options) run(ctx context.Context) error {
ctrlConfig := o.registryOptions.Completed()
ctrlConfig.Apply(&cachecontroller.DefaultAddOptions.Config)
o.controllerOptions.Completed().Apply(&cachecontroller.DefaultAddOptions.ControllerOptions)
o.reconcileOptions.Completed().Apply(&cachecontroller.DefaultAddOptions.IgnoreOperationAnnotation)
o.reconcileOptions.Completed().Apply(&cachecontroller.DefaultAddOptions.IgnoreOperationAnnotation, ptr.To(extensionsv1alpha1.ExtensionClassShoot))
o.heartbeatOptions.Completed().Apply(&heartbeatcontroller.DefaultAddOptions)

if err := o.controllerSwitches.Completed().AddToManager(ctx, mgr); err != nil {
Expand Down
67 changes: 33 additions & 34 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ toolchain go1.22.5

require (
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
github.com/gardener/gardener v1.100.1
github.com/go-logr/logr v1.4.1
github.com/onsi/ginkgo/v2 v2.19.0
github.com/onsi/gomega v1.33.1
github.com/gardener/gardener v1.102.0
github.com/go-logr/logr v1.4.2
github.com/onsi/ginkgo/v2 v2.20.0
github.com/onsi/gomega v1.34.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
go.uber.org/mock v0.4.0
golang.org/x/tools v0.23.0
k8s.io/api v0.29.7
k8s.io/apimachinery v0.29.7
k8s.io/autoscaler/vertical-pod-autoscaler v1.1.2
k8s.io/client-go v0.29.7
k8s.io/code-generator v0.29.7
k8s.io/component-base v0.29.7
golang.org/x/tools v0.24.0
k8s.io/api v0.29.8
k8s.io/apimachinery v0.29.8
k8s.io/autoscaler/vertical-pod-autoscaler v1.2.1
k8s.io/client-go v0.29.8
k8s.io/code-generator v0.29.8
k8s.io/component-base v0.29.8
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.17.5
sigs.k8s.io/controller-runtime v0.17.6
)

require (
Expand All @@ -44,7 +44,7 @@ require (
github.com/fluent/fluent-operator/v2 v2.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gardener/cert-management v0.15.0 // indirect
github.com/gardener/etcd-druid v0.22.3 // indirect
github.com/gardener/etcd-druid v0.22.4 // indirect
github.com/gardener/hvpa-controller/api v0.15.0 // indirect
github.com/gardener/machine-controller-manager v0.53.1 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
Expand All @@ -61,7 +61,7 @@ require (
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -76,7 +76,6 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand All @@ -88,7 +87,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/common v0.47.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
Expand All @@ -99,36 +98,36 @@ require (
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.20.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.6.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/protobuf v1.34.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
helm.sh/helm/v3 v3.14.4 // indirect
istio.io/api v1.22.3 // indirect
istio.io/api v1.22.4 // indirect
istio.io/client-go v1.22.0 // indirect
k8s.io/apiextensions-apiserver v0.29.7 // indirect
k8s.io/apiserver v0.29.7 // indirect
k8s.io/cluster-bootstrap v0.29.7 // indirect
k8s.io/component-helpers v0.29.7 // indirect
k8s.io/apiextensions-apiserver v0.29.8 // indirect
k8s.io/apiserver v0.29.8 // indirect
k8s.io/cluster-bootstrap v0.29.8 // indirect
k8s.io/component-helpers v0.29.8 // indirect
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-aggregator v0.29.7 // indirect
k8s.io/kube-aggregator v0.29.8 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/kubelet v0.29.7 // indirect
k8s.io/metrics v0.29.7 // indirect
k8s.io/kubelet v0.29.8 // indirect
k8s.io/metrics v0.29.8 // indirect
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231015215740-bf15e44028f9 // indirect
sigs.k8s.io/controller-tools v0.14.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
Loading

0 comments on commit 4732ba9

Please sign in to comment.