Skip to content

Commit

Permalink
Update to github.com/gardener/[email protected] (#605)
Browse files Browse the repository at this point in the history 
* Update to `github.com/gardener/[email protected]`

* resolving conflicts

* fix add options extension class

* Update changes for imageVector

* rebasing with main

---------

Co-authored-by: ushabelgur <[email protected]>
  • Loading branch information
@kasabe28 @ushabelgur
kasabe28 and ushabelgur authored Sep 25, 2024
1 parent 9a66cb8 commit 52b88c0
Show file tree
Hide file tree
Showing 26 changed files with 217 additions and 35 deletions.
10 changes: 5 additions & 5 deletions cmd/gardener-extension-provider-ironcore/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,11 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
bastionCtrlOpts.Completed().Apply(&bastioncontroller.DefaultAddOptions.Controller)
backupBucketCtrlOpts.Completed().Apply(&backupbucketcontroller.DefaultAddOptions.Controller)
backupEntryCtrlOpts.Completed().Apply(&backupentrycontroller.DefaultAddOptions.Controller)
reconcileOpts.Completed().Apply(&bastioncontroller.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&infrastructurecontroller.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&workercontroller.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&backupbucketcontroller.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&backupentrycontroller.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&bastioncontroller.DefaultAddOptions.IgnoreOperationAnnotation, &bastioncontroller.DefaultAddOptions.ExtensionClass)
reconcileOpts.Completed().Apply(&infrastructurecontroller.DefaultAddOptions.IgnoreOperationAnnotation, &infrastructurecontroller.DefaultAddOptions.ExtensionClass)
reconcileOpts.Completed().Apply(&workercontroller.DefaultAddOptions.IgnoreOperationAnnotation, &workercontroller.DefaultAddOptions.ExtensionClass)
reconcileOpts.Completed().Apply(&backupbucketcontroller.DefaultAddOptions.IgnoreOperationAnnotation, &backupbucketcontroller.DefaultAddOptions.ExtensionClass)
reconcileOpts.Completed().Apply(&backupentrycontroller.DefaultAddOptions.IgnoreOperationAnnotation, &backupentrycontroller.DefaultAddOptions.ExtensionClass)
workercontroller.DefaultAddOptions.GardenCluster = gardenCluster

if _, err := webhookOptions.Completed().AddToManager(ctx, mgr, nil); err != nil {
Expand Down
7 changes: 7 additions & 0 deletions example/20-crd-extensions.gardener.cloud_backupbuckets.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ spec:
Specification of the BackupBucket.
If the object's deletion timestamp is set, this field is immutable.
properties:
class:
description: Class holds the extension class used to control the responsibility
for multiple provider extensions.
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
providerConfig:
description: ProviderConfig is the provider specific configuration.
type: object
Expand Down
7 changes: 7 additions & 0 deletions example/20-crd-extensions.gardener.cloud_backupentries.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ spec:
description: BucketName is the name of backup bucket for this Backup
Entry.
type: string
class:
description: Class holds the extension class used to control the responsibility
for multiple provider extensions.
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
providerConfig:
description: ProviderConfig is the provider specific configuration.
type: object
Expand Down
7 changes: 7 additions & 0 deletions example/20-crd-extensions.gardener.cloud_bastions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ spec:
Spec is the specification of this Bastion.
If the object's deletion timestamp is set, this field is immutable.
properties:
class:
description: Class holds the extension class used to control the responsibility
for multiple provider extensions.
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
ingress:
description: Ingress controls from where the created bastion host
should be reachable.
Expand Down
7 changes: 7 additions & 0 deletions example/20-crd-extensions.gardener.cloud_containerruntimes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ spec:
description: BinaryPath is the Worker's machine path where container
runtime extensions should copy the binaries to.
type: string
class:
description: Class holds the extension class used to control the responsibility
for multiple provider extensions.
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
providerConfig:
description: ProviderConfig is the provider specific configuration.
type: object
Expand Down
7 changes: 7 additions & 0 deletions example/20-crd-extensions.gardener.cloud_controlplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ spec:
Specification of the ControlPlane.
If the object's deletion timestamp is set, this field is immutable.
properties:
class:
description: Class holds the extension class used to control the responsibility
for multiple provider extensions.
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
infrastructureProviderStatus:
description: |-
InfrastructureProviderStatus contains the provider status that has
Expand Down
7 changes: 7 additions & 0 deletions example/20-crd-extensions.gardener.cloud_dnsrecords.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ spec:
Specification of the DNSRecord.
If the object's deletion timestamp is set, this field is immutable.
properties:
class:
description: Class holds the extension class used to control the responsibility
for multiple provider extensions.
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
name:
description: Name is the fully qualified domain name, e.g. "api.<shoot
domain>". This field is immutable.
Expand Down
7 changes: 7 additions & 0 deletions example/20-crd-extensions.gardener.cloud_extensions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ spec:
Specification of the Extension.
If the object's deletion timestamp is set, this field is immutable.
properties:
class:
description: Class holds the extension class used to control the responsibility
for multiple provider extensions.
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
providerConfig:
description: ProviderConfig is the provider specific configuration.
type: object
Expand Down
7 changes: 7 additions & 0 deletions example/20-crd-extensions.gardener.cloud_infrastructures.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ spec:
Specification of the Infrastructure.
If the object's deletion timestamp is set, this field is immutable.
properties:
class:
description: Class holds the extension class used to control the responsibility
for multiple provider extensions.
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
providerConfig:
description: ProviderConfig is the provider specific configuration.
type: object
Expand Down
7 changes: 7 additions & 0 deletions example/20-crd-extensions.gardener.cloud_networks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ spec:
Specification of the Network.
If the object's deletion timestamp is set, this field is immutable.
properties:
class:
description: Class holds the extension class used to control the responsibility
for multiple provider extensions.
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
ipFamilies:
description: |-
IPFamilies specifies the IP protocol versions to use for shoot networking. This field is immutable.
Expand Down
85 changes: 83 additions & 2 deletions example/20-crd-extensions.gardener.cloud_operatingsystemconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,95 @@ spec:
Specification of the OperatingSystemConfig.
If the object's deletion timestamp is set, this field is immutable.
properties:
class:
description: Class holds the extension class used to control the responsibility
for multiple provider extensions.
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
criConfig:
description: CRI config is a structure contains configurations of
the CRI library
properties:
containerd:
description: |-
ContainerdConfig is the containerd configuration.
Only to be set for OperatingSystemConfigs with purpose 'reconcile'.
properties:
registries:
description: Registries configures the registry hosts for
containerd.
items:
description: RegistryConfig contains registry configuration
options.
properties:
hosts:
description: |-
Hosts are the registry hosts.
It corresponds to the host fields in the `hosts.toml` file, see https://github.com/containerd/containerd/blob/c51463010e0682f76dfdc10edc095e6596e2764b/docs/hosts.md#host-fields-in-the-toml-table-format for more information.
items:
description: RegistryHost contains configuration values
for a registry host.
properties:
caCerts:
description: CACerts are paths to public key certificates
used for TLS.
items:
type: string
type: array
capabilities:
description: |-
Capabilities determine what operations a host is
capable of performing. Defaults to
- pull
- resolve
items:
description: RegistryCapability specifies an
action a client can perform against a registry.
type: string
type: array
url:
description: URL is the endpoint address of the
registry mirror.
type: string
required:
- url
type: object
type: array
readinessProbe:
description: ReadinessProbe determines if host registry
endpoints should be probed before they are added to
the containerd config.
type: boolean
server:
description: |-
Server is the URL to registry server of this upstream.
It corresponds to the server field in the `hosts.toml` file, see https://github.com/containerd/containerd/blob/c51463010e0682f76dfdc10edc095e6596e2764b/docs/hosts.md#server-field for more information.
type: string
upstream:
description: Upstream is the upstream name of the registry.
type: string
required:
- upstream
type: object
type: array
sandboxImage:
description: SandboxImage configures the sandbox image for
containerd.
type: string
required:
- sandboxImage
type: object
name:
description: Name is a mandatory string containing the name of
the CRI library. Supported values are `containerd`.
enum:
- containerd
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
required:
- name
type: object
Expand Down Expand Up @@ -141,7 +222,7 @@ spec:
permissions:
description: |-
Permissions describes with which permissions the file should get written to the file system.
Should be defaulted to octal 0644.
If no permissions are set, the operating system's defaults are used.
format: int32
type: integer
required:
Expand Down Expand Up @@ -355,7 +436,7 @@ spec:
permissions:
description: |-
Permissions describes with which permissions the file should get written to the file system.
Should be defaulted to octal 0644.
If no permissions are set, the operating system's defaults are used.
format: int32
type: integer
required:
Expand Down
9 changes: 8 additions & 1 deletion example/20-crd-extensions.gardener.cloud_workers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ spec:
Specification of the Worker.
If the object's deletion timestamp is set, this field is immutable.
properties:
class:
description: Class holds the extension class used to control the responsibility
for multiple provider extensions.
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
infrastructureProviderStatus:
description: |-
InfrastructureProviderStatus is a raw extension field that contains the provider status that has
Expand Down Expand Up @@ -286,7 +293,7 @@ spec:
when a new machine/VM that is part of this worker pool shall be spawned.
Either this or UserDataSecretRef must be provided.
Deprecated: This field will be removed in future release.
TODO(rfranzke): Remove this field after v1.100 has been released.
TODO(rfranzke): Remove this field after v1.104 has been released.
format: byte
type: string
userDataSecretRef:
Expand Down
12 changes: 6 additions & 6 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/coreos/butane v0.21.0
github.com/coreos/go-systemd/v22 v22.5.0
github.com/gardener/etcd-druid v0.22.4
github.com/gardener/gardener v1.99.1
github.com/gardener/gardener v1.101.0
github.com/gardener/machine-controller-manager v0.53.1
github.com/go-logr/logr v1.4.2
github.com/imdario/mergo v0.3.16
Expand All @@ -32,7 +32,7 @@ require (
k8s.io/code-generator v0.29.9
k8s.io/component-base v0.29.9
k8s.io/kubelet v0.29.9
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.17.6
sigs.k8s.io/controller-tools v0.14.0
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -126,22 +126,22 @@ require (
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.5.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.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.2 // indirect
istio.io/api v1.22.3 // indirect
istio.io/client-go v1.22.0 // 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.6 // indirect
k8s.io/kube-aggregator v0.29.7 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/metrics v0.29.6 // indirect
k8s.io/metrics v0.29.7 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Loading

0 comments on commit 52b88c0

Please sign in to comment.