Skip to content

Commit

Permalink
Vendor gardener/gardener@v1.91.1, Upgrade k8s.io/* dependencies and c…
Browse files Browse the repository at this point in the history
…ontroller-runtime (#814)

* Vendor gardener@v1.91.1 and adapt changes

* Update golang image

* Refactor to.Ptr

* Fix whitespace in Makefike

* Add KnownCodes to infrastructure args

* Make generate
  • Loading branch information
hebelsan authored Apr 4, 2024
1 parent 6507297 commit 8e4be84
Show file tree
Hide file tree
Showing 83 changed files with 2,822 additions and 1,690 deletions.
6 changes: 5 additions & 1 deletion .ci/hack/component_descriptor
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
#
# SPDX-License-Identifier: Apache-2.0

# Configuration Options:
#
# COMPONENT_PREFIXES: Set the image prefix that should be used to
Expand Down Expand Up @@ -55,7 +59,7 @@ fi
if [[ ! -z "$image_vector_path" ]]; then
# default environment variables
if [[ -z "${COMPONENT_PREFIXES}" ]]; then
COMPONENT_PREFIXES="europe-docker.pkg.dev/gardener-project/releases/gardener"
COMPONENT_PREFIXES="europe-docker.pkg.dev/gardener-project/releases/gardener,europe-docker.pkg.dev/gardener-project/snapshots/gardener"
fi

if [[ -z "${COMPONENT_CLI_ARGS}" ]]; then
Expand Down
18 changes: 5 additions & 13 deletions .ci/hack/doc.go
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
// Copyright 2020 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
*
* SPDX-License-Identifier: Apache-2.0
*/

// This package imports CI related scripts - it is to force `go mod` to see them as dependencies.
package ci
14 changes: 2 additions & 12 deletions .ci/hack/prepare_release
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
#!/usr/bin/env sh
#
# Copyright 2019 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file
# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# SPDX-License-Identifier: Apache-2.0

set -e

Expand Down
14 changes: 2 additions & 12 deletions .ci/hack/set_dependency_version
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
#!/usr/bin/env python3
#
# Copyright 2020 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file
# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# SPDX-License-Identifier: Apache-2.0

import json
import pathlib
Expand Down
2 changes: 1 addition & 1 deletion .test-defs/bastion-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ spec:
--client-secret=${CLIENT_SECRET}
--region=${REGION}
image: golang:1.21.1
image: golang:1.22.1
2 changes: 1 addition & 1 deletion .test-defs/infrastructure-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ spec:
--region=${REGION}
--reconciler=${RECONCILER}
image: golang:1.21.1
image: golang:1.22.1
2 changes: 1 addition & 1 deletion .test-defs/provider-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ spec:
--network-vnet-cidr=$NETWORK_VNET_CIDR
--network-worker-cidr=$NETWORK_WORKER_CIDR
--zoned=$ZONED
image: golang:1.21.1
image: golang:1.22.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############# builder
FROM golang:1.21.1 AS builder
FROM golang:1.22.1 AS builder

WORKDIR /go/src/github.com/gardener/gardener-extension-provider-azure

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0

ENSURE_GARDENER_MOD := $(shell go get github.com/gardener/gardener@$$(go list -m -f "{{.Version}}" github.com/gardener/gardener))
GARDENER_HACK_DIR := $(shell go list -m -f "{{.Dir}}" github.com/gardener/gardener)/hack
GARDENER_HACK_DIR := $(shell go list -m -f "{{.Dir}}" github.com/gardener/gardener)/hack
EXTENSION_PREFIX := gardener-extension
NAME := provider-azure
ADMISSION_NAME := admission-azure
Expand Down
2 changes: 1 addition & 1 deletion cmd/gardener-extension-admission-azure/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func NewAdmissionCommand(ctx context.Context) *cobra.Command {
cmd := &cobra.Command{
Use: fmt.Sprintf("admission-%s", providerazure.Type),

RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(_ *cobra.Command, _ []string) error {
verflag.PrintAndExitIfRequested()

if err := aggOption.Complete(); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/gardener-extension-provider-azure/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
cmd := &cobra.Command{
Use: fmt.Sprintf("%s-controller-manager", azure.Name),

RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(_ *cobra.Command, _ []string) error {
verflag.PrintAndExitIfRequested()

if err := aggOption.Complete(); err != nil {
Expand Down
29 changes: 17 additions & 12 deletions example/20-crd-druid.gardener.cloud_etcdcopybackupstasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: etcdcopybackupstasks.druid.gardener.cloud
spec:
group: druid.gardener.cloud
Expand All @@ -25,14 +25,19 @@ spec:
source to a target store.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -41,9 +46,9 @@ spec:
backups task.
properties:
maxBackupAge:
description: MaxBackupAge is the maximum age in days that a backup
must have in order to be copied. By default all backups will be
copied.
description: |-
MaxBackupAge is the maximum age in days that a backup must have in order to be copied.
By default all backups will be copied.
format: int32
type: integer
maxBackups:
Expand Down Expand Up @@ -122,8 +127,8 @@ spec:
snapshot before copying backups.
type: boolean
timeout:
description: Timeout is the timeout for waiting for a final full
snapshot. When this timeout expires, the copying of backups
description: |-
Timeout is the timeout for waiting for a final full snapshot. When this timeout expires, the copying of backups
will be performed anyway. No timeout or 0 means wait forever.
type: string
required:
Expand Down
Loading

0 comments on commit 8e4be84

Please sign in to comment.