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

Bump github.com/gardener/gardener from 1.97.1 to 1.102.1 #198

Merged
merged 3 commits into from
Sep 5, 2024
Merged

Bump github.com/gardener/gardener from 1.97.1 to 1.102.1 #198

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
8370b03
Bump github.com/gardener/gardener from 1.97.1 to 1.102.1
dependabot[bot] Sep 3, 2024
3c1be1f
[dependabot skip] make revendor
gardener-robot-ci-1 Sep 3, 2024
c2e02cb
add extensionclass
MrBatschner Sep 4, 2024
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
4 changes: 3 additions & 1 deletion .ci/hack/component_descriptor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,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 @@ -70,7 +72,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-os-gardenlinux/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ import (
heartbeatcmd "github.com/gardener/gardener/extensions/pkg/controller/heartbeat/cmd"
osccontroller "github.com/gardener/gardener/extensions/pkg/controller/operatingsystemconfig"
"github.com/gardener/gardener/extensions/pkg/util"
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
componentbaseconfig "k8s.io/component-base/config"
"k8s.io/utils/ptr"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager"

Expand Down Expand Up @@ -103,7 +105,7 @@ func NewControllerCommand(ctx context.Context) *cobra.Command {
ctrlOpts.Completed().Apply(&operatingsystemconfig.DefaultAddOptions.Controller)
heartbeatCtrlOpts.Completed().Apply(&heartbeat.DefaultAddOptions)

reconcileOpts.Completed().Apply(&operatingsystemconfig.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&operatingsystemconfig.DefaultAddOptions.IgnoreOperationAnnotation, ptr.To(extensionsv1alpha1.ExtensionClassShoot))

if err := controllerSwitches.Completed().AddToManager(ctx, mgr); err != nil {
return fmt.Errorf("could not add controller to manager: %w", err)
Expand Down
72 changes: 36 additions & 36 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
module github.com/gardener/gardener-extension-os-gardenlinux

go 1.22.2
go 1.22.6

require (
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
github.com/gardener/gardener v1.97.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/spf13/cobra v1.8.0
golang.org/x/tools v0.22.0
k8s.io/api v0.29.5
k8s.io/apimachinery v0.29.5
k8s.io/code-generator v0.29.5
k8s.io/component-base v0.29.5
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
sigs.k8s.io/controller-runtime v0.17.5
github.com/gardener/gardener v1.102.1
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/spf13/cobra v1.8.1
golang.org/x/tools v0.24.0
k8s.io/api v0.29.8
k8s.io/apimachinery 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.6
)

require (
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand All @@ -32,12 +33,12 @@ require (
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fluent/fluent-operator/v2 v2.8.0 // indirect
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.0 // 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.0 // indirect
github.com/gardener/machine-controller-manager v0.53.1 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/errors v0.20.4 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
Expand All @@ -52,7 +53,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 @@ -67,7 +68,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/reflectwalk v1.0.2 // indirect
github.com/moby/spdystream v0.2.0 // indirect
Expand All @@ -79,7 +79,7 @@ require (
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 // 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 @@ -92,35 +92,35 @@ require (
go.uber.org/mock v0.4.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.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.21.0 // indirect
golang.org/x/term v0.21.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.1 // indirect
istio.io/api v1.22.4 // indirect
istio.io/client-go v1.22.0 // indirect
k8s.io/apiextensions-apiserver v0.29.5 // indirect
k8s.io/autoscaler/vertical-pod-autoscaler v1.1.2 // indirect
k8s.io/client-go v0.29.5 // indirect
k8s.io/apiextensions-apiserver v0.29.8 // indirect
k8s.io/autoscaler/vertical-pod-autoscaler v1.2.1 // indirect
k8s.io/client-go 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.5 // indirect
k8s.io/kube-aggregator v0.29.8 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/kubelet v0.29.5 // indirect
k8s.io/metrics v0.29.5 // 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
Loading