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

Vendor gardener@1.56.0 and Upgrade k8s dependencies and controller-runtime #609

Merged
merged 4 commits into from
Oct 7, 2022
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 12 additions & 12 deletions charts/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,57 +67,57 @@ images:
tag: "v1.11.3"
- name: csi-provisioner
sourceRepository: github.com/kubernetes-csi/external-provisioner
repository: k8s.gcr.io/sig-storage/csi-provisioner
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: "v2.2.2"
targetVersion: "< 1.20"
- name: csi-provisioner
sourceRepository: github.com/kubernetes-csi/external-provisioner
repository: k8s.gcr.io/sig-storage/csi-provisioner
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: "v3.2.0"
targetVersion: ">= 1.20"
- name: csi-attacher
sourceRepository: github.com/kubernetes-csi/external-attacher
repository: k8s.gcr.io/sig-storage/csi-attacher
repository: registry.k8s.io/sig-storage/csi-attacher
tag: "v3.4.0"
- name: csi-resizer
sourceRepository: github.com/kubernetes-csi/external-resizer
repository: k8s.gcr.io/sig-storage/csi-resizer
repository: registry.k8s.io/sig-storage/csi-resizer
tag: "v1.5.0"
- name: csi-snapshotter
sourceRepository: github.com/kubernetes-csi/external-snapshotter
repository: k8s.gcr.io/sig-storage/csi-snapshotter
repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: "v3.0.3"
targetVersion: "< 1.20"
- name: csi-snapshotter
sourceRepository: github.com/kubernetes-csi/external-snapshotter
repository: k8s.gcr.io/sig-storage/csi-snapshotter
repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: "v4.2.1"
targetVersion: ">= 1.20"
- name: csi-snapshot-validation-webhook
sourceRepository: github.com/kubernetes-csi/external-snapshotter
repository: k8s.gcr.io/sig-storage/snapshot-validation-webhook
repository: registry.k8s.io/sig-storage/snapshot-validation-webhook
tag: "v3.0.3"
targetVersion: "< 1.20"
- name: csi-snapshot-validation-webhook
sourceRepository: github.com/kubernetes-csi/external-snapshotter
repository: k8s.gcr.io/sig-storage/snapshot-validation-webhook
repository: registry.k8s.io/sig-storage/snapshot-validation-webhook
tag: "v4.2.1"
targetVersion: ">= 1.20"
- name: csi-snapshot-controller
sourceRepository: github.com/kubernetes-csi/external-snapshotter
repository: k8s.gcr.io/sig-storage/snapshot-controller
repository: registry.k8s.io/sig-storage/snapshot-controller
tag: "v3.0.3"
targetVersion: "< 1.20"
- name: csi-snapshot-controller
sourceRepository: github.com/kubernetes-csi/external-snapshotter
repository: k8s.gcr.io/sig-storage/snapshot-controller
repository: registry.k8s.io/sig-storage/snapshot-controller
tag: "v4.2.1"
targetVersion: ">= 1.20"
- name: csi-node-driver-registrar
sourceRepository: github.com/kubernetes-csi/node-driver-registrar
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: "v2.5.1"
- name: csi-liveness-probe
sourceRepository: github.com/kubernetes-csi/livenessprobe
repository: k8s.gcr.io/sig-storage/livenessprobe
repository: registry.k8s.io/sig-storage/livenessprobe
tag: "v2.7.0"
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.9.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: etcdcopybackupstasks.druid.gardener.cloud
spec:
Expand Down Expand Up @@ -79,6 +79,7 @@ spec:
secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
required:
- prefix
type: object
Expand Down Expand Up @@ -109,6 +110,7 @@ spec:
secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
required:
- prefix
type: object
Expand Down
80 changes: 70 additions & 10 deletions example/20-crd-druid.gardener.cloud_etcds.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.9.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: etcds.druid.gardener.cloud
spec:
Expand Down Expand Up @@ -227,6 +227,7 @@ spec:
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
required:
- prefix
type: object
Expand All @@ -246,6 +247,7 @@ spec:
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
serverTLSSecretRef:
description: SecretReference represents a Secret Reference.
It has enough information to retrieve secret in any namespace
Expand All @@ -259,6 +261,7 @@ spec:
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
tlsCASecretRef:
description: SecretReference defines a reference to a secret.
properties:
Expand All @@ -275,6 +278,7 @@ spec:
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
required:
- serverTLSSecretRef
- tlsCASecretRef
Expand All @@ -296,6 +300,7 @@ spec:
secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
clientPort:
format: int32
type: integer
Expand All @@ -316,6 +321,7 @@ spec:
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
serverTLSSecretRef:
description: SecretReference represents a Secret Reference.
It has enough information to retrieve secret in any namespace
Expand All @@ -329,6 +335,7 @@ spec:
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
tlsCASecretRef:
description: SecretReference defines a reference to a secret.
properties:
Expand All @@ -345,6 +352,7 @@ spec:
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
required:
- serverTLSSecretRef
- tlsCASecretRef
Expand Down Expand Up @@ -390,6 +398,7 @@ spec:
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
serverTLSSecretRef:
description: SecretReference represents a Secret Reference.
It has enough information to retrieve secret in any namespace
Expand All @@ -403,6 +412,7 @@ spec:
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
tlsCASecretRef:
description: SecretReference defines a reference to a secret.
properties:
Expand All @@ -419,6 +429,7 @@ spec:
the secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
required:
- serverTLSSecretRef
- tlsCASecretRef
Expand Down Expand Up @@ -584,6 +595,7 @@ spec:
type: object
type: array
type: object
x-kubernetes-map-type: atomic
weight:
description: Weight associated with matching the
corresponding nodeSelectorTerm, in the range 1-100.
Expand Down Expand Up @@ -689,10 +701,12 @@ spec:
type: object
type: array
type: object
x-kubernetes-map-type: atomic
type: array
required:
- nodeSelectorTerms
type: object
x-kubernetes-map-type: atomic
type: object
podAffinity:
description: Describes pod affinity scheduling rules (e.g.
Expand Down Expand Up @@ -773,6 +787,7 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied
Expand Down Expand Up @@ -830,6 +845,7 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies a static list
of namespace names that the term applies to.
Expand Down Expand Up @@ -934,6 +950,7 @@ spec:
The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied
Expand Down Expand Up @@ -990,6 +1007,7 @@ spec:
The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies a static list
of namespace names that the term applies to. The
Expand Down Expand Up @@ -1093,6 +1111,7 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied
Expand Down Expand Up @@ -1150,6 +1169,7 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies a static list
of namespace names that the term applies to.
Expand Down Expand Up @@ -1254,6 +1274,7 @@ spec:
The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied
Expand Down Expand Up @@ -1310,6 +1331,7 @@ spec:
The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies a static list
of namespace names that the term applies to. The
Expand Down Expand Up @@ -1390,6 +1412,20 @@ spec:
contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
matchLabelKeys:
description: MatchLabelKeys is a set of pod label keys to
select the pods over which spreading will be calculated.
The keys are used to lookup values from the incoming pod
labels, those key-value labels are ANDed with labelSelector
to select the group of existing pods over which spreading
will be calculated for the incoming pod. Keys that don't
exist in the incoming pod labels will be ignored. A null
or empty list means only match against labelSelector.
items:
type: string
type: array
x-kubernetes-list-type: atomic
maxSkew:
description: 'MaxSkew describes the degree to which pods
may be unevenly distributed. When `whenUnsatisfiable=DoNotSchedule`,
Expand Down Expand Up @@ -1432,23 +1468,45 @@ spec:
as 0. In this situation, new pod with the same labelSelector
cannot be scheduled, because computed skew will be 3(3
- 0) if new Pod is scheduled to any of the three zones,
it will violate MaxSkew. \n This is an alpha field and
requires enabling MinDomainsInPodTopologySpread feature
gate."
it will violate MaxSkew. \n This is a beta field and requires
the MinDomainsInPodTopologySpread feature gate to be enabled
(enabled by default)."
format: int32
type: integer
nodeAffinityPolicy:
description: "NodeAffinityPolicy indicates how we will treat
Pod's nodeAffinity/nodeSelector when calculating pod topology
spread skew. Options are: - Honor: only nodes matching
nodeAffinity/nodeSelector are included in the calculations.
- Ignore: nodeAffinity/nodeSelector are ignored. All nodes
are included in the calculations. \n If this value is
nil, the behavior is equivalent to the Honor policy. This
is a alpha-level feature enabled by the NodeInclusionPolicyInPodTopologySpread
feature flag."
type: string
nodeTaintsPolicy:
description: "NodeTaintsPolicy indicates how we will treat
node taints when calculating pod topology spread skew.
Options are: - Honor: nodes without taints, along with
tainted nodes for which the incoming pod has a toleration,
are included. - Ignore: node taints are ignored. All nodes
are included. \n If this value is nil, the behavior is
equivalent to the Ignore policy. This is a alpha-level
feature enabled by the NodeInclusionPolicyInPodTopologySpread
feature flag."
type: string
topologyKey:
description: TopologyKey is the key of node labels. Nodes
that have a label with this key and identical values are
considered to be in the same topology. We consider each
<key, value> as a "bucket", and try to put balanced number
of pods into each bucket. We define a domain as a particular
instance of a topology. Also, we define an eligible domain
as a domain whose nodes match the node selector. e.g.
If TopologyKey is "kubernetes.io/hostname", each Node
is a domain of that topology. And, if TopologyKey is "topology.kubernetes.io/zone",
each zone is a domain of that topology. It's a required
field.
as a domain whose nodes meet the requirements of nodeAffinityPolicy
and nodeTaintsPolicy. e.g. If TopologyKey is "kubernetes.io/hostname",
each Node is a domain of that topology. And, if TopologyKey
is "topology.kubernetes.io/zone", each zone is a domain
of that topology. It's a required field.
type: string
whenUnsatisfiable:
description: 'WhenUnsatisfiable indicates how to deal with
Expand Down Expand Up @@ -1522,6 +1580,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
sharedConfig:
description: SharedConfig defines parameters shared and used by Etcd
as well as backup-restore sidecar.
Expand Down Expand Up @@ -1671,6 +1730,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
lastError:
description: LastError represents the last occurred error.
type: string
Expand Down Expand Up @@ -1715,7 +1775,7 @@ spec:
format: int64
type: integer
ready:
description: Ready represents the readiness of the etcd resource.
description: Ready is `true` if all etcd replicas are ready.
type: boolean
readyReplicas:
description: ReadyReplicas is the count of replicas being ready in
Expand Down
Loading