Skip to content

Commit

Permalink
Update gardener and golang version (#850)
Browse files Browse the repository at this point in the history
  • Loading branch information
hebelsan authored Sep 11, 2024
1 parent 27c6ece commit 0da281b
Show file tree
Hide file tree
Showing 33 changed files with 394 additions and 195 deletions.
4 changes: 3 additions & 1 deletion .ci/hack/component_descriptor
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
2 changes: 1 addition & 1 deletion .test-defs/apply-flow-openstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ spec:
--shoot-name=$SHOOT_NAME
--project-namespace=$PROJECT_NAMESPACE
--kubecfg="$TM_KUBECONFIG_PATH/gardener.config"
image: golang:1.22.1
image: golang:1.23.0
2 changes: 1 addition & 1 deletion .test-defs/bastion-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ spec:
--app-secret="$APPLICATION_CREDENTIAL_SECRET"
--flavor-ref="$FLAVOR_REF"
--image-ref="$IMAGE_REF"
image: golang:1.22.6
image: golang:1.23.0
2 changes: 1 addition & 1 deletion .test-defs/infrastructure-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ spec:
--app-secret="$APPLICATION_CREDENTIAL_SECRET"
--reconciler="${RECONCILER}"
image: golang:1.22.6
image: golang:1.23.0
2 changes: 1 addition & 1 deletion .test-defs/provider-openstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ spec:
--loadbalancer-provider=$LOADBALANCER_PROVIDER
--network-worker-cidr=$NETWORK_WORKER_CIDR
image: golang:1.22.6
image: golang:1.23.0
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.22.6 AS builder
FROM golang:1.23.0 AS builder

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

Expand Down
8 changes: 4 additions & 4 deletions cmd/gardener-extension-provider-openstack/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,10 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
controlPlaneCtrlOpts.Completed().Apply(&openstackcontrolplane.DefaultAddOptions.Controller)
dnsRecordCtrlOpts.Completed().Apply(&openstackdnsrecord.DefaultAddOptions.Controller)
infraCtrlOpts.Completed().Apply(&openstackinfrastructure.DefaultAddOptions.Controller)
reconcileOpts.Completed().Apply(&openstackinfrastructure.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&openstackcontrolplane.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&openstackworker.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&openstackbastion.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&openstackinfrastructure.DefaultAddOptions.IgnoreOperationAnnotation, &openstackinfrastructure.DefaultAddOptions.ExtensionClass)
reconcileOpts.Completed().Apply(&openstackcontrolplane.DefaultAddOptions.IgnoreOperationAnnotation, &openstackcontrolplane.DefaultAddOptions.ExtensionClass)
reconcileOpts.Completed().Apply(&openstackworker.DefaultAddOptions.IgnoreOperationAnnotation, &openstackworker.DefaultAddOptions.ExtensionClass)
reconcileOpts.Completed().Apply(&openstackbastion.DefaultAddOptions.IgnoreOperationAnnotation, &openstackbastion.DefaultAddOptions.ExtensionClass)
workerCtrlOpts.Completed().Apply(&openstackworker.DefaultAddOptions.Controller)
openstackworker.DefaultAddOptions.GardenCluster = gardenCluster

Expand Down
7 changes: 7 additions & 0 deletions example/20-crd-extensions.gardener.cloud_backupbuckets.yaml
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
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
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
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
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
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
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
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
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
117 changes: 115 additions & 2 deletions example/20-crd-extensions.gardener.cloud_operatingsystemconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,127 @@ 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:
cgroupDriver:
description: CgroupDriver configures the CRI's cgroup driver.
Supported values are `cgroupfs` or `systemd`.
type: string
containerd:
description: |-
ContainerdConfig is the containerd configuration.
Only to be set for OperatingSystemConfigs with purpose 'reconcile'.
properties:
plugins:
description: Plugins configures the plugins section in containerd's
config.toml.
items:
description: PluginConfig contains configuration values
for the containerd plugins section.
properties:
op:
description: Op is the operation for the given path.
Possible values are 'add' and 'remove', defaults to
'add'.
type: string
path:
description: Path is a list of elements that construct
the path in the plugins section.
items:
type: string
type: array
values:
description: |-
Values are the values configured at the given path. If defined, it is expected as json format:
- A given json object will be put to the given path.
- If not configured, only the table entry to be created.
x-kubernetes-preserve-unknown-fields: true
required:
- path
type: object
type: array
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 +254,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 +468,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
11 changes: 10 additions & 1 deletion example/20-crd-extensions.gardener.cloud_workers.yaml
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 @@ -285,8 +292,10 @@ spec:
UserData is a base64-encoded string that contains the data that is sent to the provider's APIs
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
Loading

0 comments on commit 0da281b

Please sign in to comment.