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.

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

Revendor gardener/gardener@v1.38 and update Golang version to 1.17 #418

Merged
merged 2 commits into from
Dec 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .test-defs/infrastructure-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: eu.gcr.io/gardener-project/3rd/golang:1.16.2
image: eu.gcr.io/gardener-project/3rd/golang:1.17.5
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: eu.gcr.io/gardener-project/3rd/golang:1.16.2
image: eu.gcr.io/gardener-project/3rd/golang:1.17.5
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
############# builder
FROM golang:1.16.3 AS builder
FROM golang:1.17.5 AS builder

WORKDIR /go/src/github.com/gardener/gardener-extension-provider-azure
COPY . .
RUN make install

############# base
FROM alpine:3.13.4 AS base
FROM alpine:3.13.7 AS base

############# gardener-extension-provider-azure
FROM base AS gardener-extension-provider-azure
Expand Down
197 changes: 197 additions & 0 deletions example/20-crd-druid.gardener.cloud_etcdcopybackupstasks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
name: etcdcopybackupstasks.druid.gardener.cloud
spec:
group: druid.gardener.cloud
names:
kind: EtcdCopyBackupsTask
listKind: EtcdCopyBackupsTaskList
plural: etcdcopybackupstasks
singular: etcdcopybackupstask
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: EtcdCopyBackupsTask is a task for copying etcd backups from a
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'
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'
type: string
metadata:
type: object
spec:
description: EtcdCopyBackupsTaskSpec defines the parameters for the copy
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.
format: int32
type: integer
maxBackups:
description: MaxBackups is the maximum number of backups that will
be copied starting with the most recent ones.
format: int32
type: integer
sourceStore:
description: SourceStore defines the specification of the source object
store provider for storing backups.
properties:
container:
description: Container is the name of the container the backup
is stored at.
type: string
prefix:
description: Prefix is the prefix used for the store.
type: string
provider:
description: Provider is the name of the backup provider.
type: string
secretRef:
description: SecretRef is the reference to the secret which used
to connect to the backup store.
properties:
name:
description: Name is unique within a namespace to reference
a secret resource.
type: string
namespace:
description: Namespace defines the space within which the
secret name must be unique.
type: string
type: object
required:
- prefix
type: object
targetStore:
description: TargetStore defines the specification of the target object
store provider for storing backups.
properties:
container:
description: Container is the name of the container the backup
is stored at.
type: string
prefix:
description: Prefix is the prefix used for the store.
type: string
provider:
description: Provider is the name of the backup provider.
type: string
secretRef:
description: SecretRef is the reference to the secret which used
to connect to the backup store.
properties:
name:
description: Name is unique within a namespace to reference
a secret resource.
type: string
namespace:
description: Namespace defines the space within which the
secret name must be unique.
type: string
type: object
required:
- prefix
type: object
waitForFinalSnapshot:
description: WaitForFinalSnapshot defines the parameters for waiting
for a final full snapshot before copying backups.
properties:
enabled:
description: Enabled specifies whether to wait for a final full
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
will be performed anyway. No timeout or 0 means wait forever.
type: string
required:
- enabled
type: object
required:
- sourceStore
- targetStore
type: object
status:
description: EtcdCopyBackupsTaskStatus defines the observed state of the
copy backups task.
properties:
conditions:
description: Conditions represents the latest available observations
of an object's current state.
items:
description: Condition holds the information about the state of
a resource.
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another.
format: date-time
type: string
lastUpdateTime:
description: Last time the condition was updated.
format: date-time
type: string
message:
description: A human readable message indicating details about
the transition.
type: string
reason:
description: The reason for the condition's last transition.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: Type of the Etcd condition.
type: string
required:
- lastTransitionTime
- lastUpdateTime
- message
- reason
- status
- type
type: object
type: array
lastError:
description: LastError represents the last occurred error.
type: string
observedGeneration:
description: ObservedGeneration is the most recent generation observed
for this resource.
format: int64
type: integer
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
56 changes: 52 additions & 4 deletions example/20-crd-druid.gardener.cloud_etcds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,33 @@ spec:
description: BackupSpec defines parametes associated with the full
and delta snapshots of etcd
properties:
backupCompactionSchedule:
description: BackupCompactionSchedule defines the cron standard
for compacting the snapstore
type: string
compactionResources:
description: 'CompactionResources defines the compute Resources
required by compaction job. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Limits describes the maximum amount of compute
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Requests describes the minimum amount of compute
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
compression:
description: SnapshotCompression defines the specification for
compression of Snapshots.
Expand Down Expand Up @@ -108,6 +131,31 @@ spec:
image:
description: Image defines the etcd container image and tag
type: string
ownerCheck:
description: OwnerCheck defines parameters related to checking
if the cluster owner, as specified in the owner DNS record,
is the expected one.
properties:
dnsCacheTTL:
description: DNSCacheTTL is the DNS cache TTL for owner checks.
type: string
id:
description: ID is the owner id value that is expected to
be found in the owner DNS record.
type: string
interval:
description: Interval is the time interval between owner checks.
type: string
name:
description: Name is the domain name of the owner DNS record.
type: string
timeout:
description: Timeout is the timeout for owner checks.
type: string
required:
- id
- name
type: object
port:
description: Port define the port on which etcd-backup-restore
server will exposed.
Expand Down
21 changes: 21 additions & 0 deletions example/20-crd-extensions.gardener.cloud_workers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ spec:
description: KubeletDataVolumeName contains the name of a dataVolume
that should be used for storing kubelet state.
type: string
kubernetesVersion:
description: KubernetesVersion is the kubernetes version in
this worker pool
type: string
labels:
additionalProperties:
type: string
Expand Down Expand Up @@ -180,6 +184,23 @@ spec:
name:
description: Name is the name of this worker pool.
type: string
nodeTemplate:
description: NodeTemplate contains resource information of the
machine which is used by Cluster Autoscaler to generate nodeTemplate
during scaling a nodeGroup from zero
properties:
capacity:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: Capacity represents the expected Node capacity.
type: object
required:
- capacity
type: object
providerConfig:
description: ProviderConfig is a provider specific configuration
for the worker pool.
Expand Down
24 changes: 23 additions & 1 deletion example/20-crd-resources.gardener.cloud_managedresources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,30 @@ spec:
kind: ManagedResource
listKind: ManagedResourceList
plural: managedresources
shortNames:
- mr
singular: managedresource
scope: Namespaced
versions:
- name: v1alpha1
- additionalPrinterColumns:
- description: The class identifies which resource manager is responsible for
this ManagedResource.
jsonPath: .spec.class
name: Class
type: date
- description: ' Indicates whether all resources have been applied.'
jsonPath: .status.conditions[?(@.type=="ResourcesApplied")].status
name: Applied
type: string
- description: Indicates whether all resources are healthy.
jsonPath: .status.conditions[?(@.type=="ResourcesHealthy")].status
name: Healthy
type: string
- description: creation timestamp
jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: ManagedResource describes a list of managed resources.
Expand Down Expand Up @@ -205,6 +225,8 @@ spec:
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ require (
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/ahmetb/gen-crd-api-reference-docs v0.2.0
github.com/coreos/go-systemd/v22 v22.3.2
github.com/gardener/etcd-druid v0.6.1-0.20211022081522-071746e9d0bd
github.com/gardener/gardener v1.36.0
github.com/gardener/etcd-druid v0.7.0
github.com/gardener/gardener v1.38.1
github.com/gardener/gardener-extension-networking-calico v1.7.1-0.20200522070525-f9aa28d3c83a
github.com/gardener/machine-controller-manager v0.36.0
github.com/gardener/remedy-controller v0.6.0
Expand Down
Loading