Merge pull request #493 from Fedosin/capi17

🌱 Bump cluster-api to v1.7.0

api/v1alpha1/provider_conversion.go

@@ -20,7 +20,7 @@ import (
  "strings"
 
  apimachineryconversion "k8s.io/apimachinery/pkg/conversion"
- "k8s.io/utils/pointer"
+ "k8s.io/utils/ptr"
  utilconversion "sigs.k8s.io/cluster-api/util/conversion"
  ctrlconfigv1 "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
  "sigs.k8s.io/controller-runtime/pkg/conversion"
@@ -525,5 +525,5 @@ func fromImageMeta(im *ImageMeta) *string {
  result = result + ":" + im.Tag
  }
 
- return pointer.String(result)
+ return ptr.To(result)
 }

cmd/main.go

@@ -30,7 +30,7 @@ import (
  utilruntime "k8s.io/apimachinery/pkg/util/runtime"
  clientgoscheme "k8s.io/client-go/kubernetes/scheme"
  "k8s.io/klog/v2"
- "k8s.io/klog/v2/klogr"
+ "k8s.io/klog/v2/textlogger"
  "sigs.k8s.io/cluster-api-operator/internal/webhook"
  clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
  clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
@@ -129,7 +129,7 @@ func main() {
  pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
  pflag.Parse()
 
- ctrl.SetLogger(klogr.New())
+ ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
  restConfig := ctrl.GetConfigOrDie()
 
  diagnosticsOpts := flags.GetDiagnosticsOptions(diagnosticsOptions)

cmd/plugin/cmd/delete.go

@@ -25,14 +25,12 @@ import (
  "github.com/go-errors/errors"
  "github.com/spf13/cobra"
  corev1 "k8s.io/api/core/v1"
+ "k8s.io/apimachinery/pkg/api/meta"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/fields"
- "k8s.io/apimachinery/pkg/util/wait"
- "k8s.io/klog/v2/klogr"
-
  kerrors "k8s.io/apimachinery/pkg/util/errors"
-
- "k8s.io/apimachinery/pkg/api/meta"
+ "k8s.io/apimachinery/pkg/util/wait"
+ "k8s.io/klog/v2/textlogger"
  ctrl "sigs.k8s.io/controller-runtime"
 
  apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -141,7 +139,7 @@ func init() {
 func runDelete() error {
  ctx := context.Background()
 
- ctrl.SetLogger(klogr.New())
+ ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
 
  hasProviderNames := deleteOpts.coreProvider ||
  (len(deleteOpts.bootstrapProviders) > 0) ||

cmd/plugin/cmd/upgrade_plan.go

@@ -1,3 +1,4 @@
+//nolint
 /*
 Copyright 2023 The Kubernetes Authors.
 

config/crd/bases/operator.cluster.x-k8s.io_addonproviders.yaml

@@ -305,8 +305,9 @@ spec:
  with the corresponding weight.
  properties:
  labelSelector:
- description: A label query over a set of resources,
- in this case pods.
+ description: |-
+ A label query over a set of resources, in this case pods.
+ If it's null, this PodAffinityTerm matches with no Pods.
  properties:
  matchExpressions:
  description: matchExpressions is a list
@@ -350,6 +351,36 @@ spec:
  type: object
  type: object
  x-kubernetes-map-type: atomic
+ matchLabelKeys:
+ description: |-
+ MatchLabelKeys is a set of pod label keys to select which pods will
+ be taken into consideration. The keys are used to lookup values from the
+ incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)`
+ to select the group of existing pods which pods will be taken into consideration
+ for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+ pod labels will be ignored. The default value is empty.
+ The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+ Also, MatchLabelKeys cannot be set when LabelSelector isn't set.
+ This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ mismatchLabelKeys:
+ description: |-
+ MismatchLabelKeys is a set of pod label keys to select which pods will
+ be taken into consideration. The keys are used to lookup values from the
+ incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)`
+ to select the group of existing pods which pods will be taken into consideration
+ for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+ pod labels will be ignored. The default value is empty.
+ The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector.
+ Also, MismatchLabelKeys cannot be set when LabelSelector isn't set.
+ This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
  namespaceSelector:
  description: |-
  A label query over the set of namespaces that the term applies to.
@@ -450,8 +481,9 @@ spec:
  a pod of the set of pods is running
  properties:
  labelSelector:
- description: A label query over a set of resources,
- in this case pods.
+ description: |-
+ A label query over a set of resources, in this case pods.
+ If it's null, this PodAffinityTerm matches with no Pods.
  properties:
  matchExpressions:
  description: matchExpressions is a list of label
@@ -495,6 +527,36 @@ spec:
  type: object
  type: object
  x-kubernetes-map-type: atomic
+ matchLabelKeys:
+ description: |-
+ MatchLabelKeys is a set of pod label keys to select which pods will
+ be taken into consideration. The keys are used to lookup values from the
+ incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)`
+ to select the group of existing pods which pods will be taken into consideration
+ for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+ pod labels will be ignored. The default value is empty.
+ The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+ Also, MatchLabelKeys cannot be set when LabelSelector isn't set.
+ This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ mismatchLabelKeys:
+ description: |-
+ MismatchLabelKeys is a set of pod label keys to select which pods will
+ be taken into consideration. The keys are used to lookup values from the
+ incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)`
+ to select the group of existing pods which pods will be taken into consideration
+ for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+ pod labels will be ignored. The default value is empty.
+ The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector.
+ Also, MismatchLabelKeys cannot be set when LabelSelector isn't set.
+ This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
  namespaceSelector:
  description: |-
  A label query over the set of namespaces that the term applies to.
@@ -593,8 +655,9 @@ spec:
  with the corresponding weight.
  properties:
  labelSelector:
- description: A label query over a set of resources,
- in this case pods.
+ description: |-
+ A label query over a set of resources, in this case pods.
+ If it's null, this PodAffinityTerm matches with no Pods.
  properties:
  matchExpressions:
  description: matchExpressions is a list
@@ -638,6 +701,36 @@ spec:
  type: object
  type: object
  x-kubernetes-map-type: atomic
+ matchLabelKeys:
+ description: |-
+ MatchLabelKeys is a set of pod label keys to select which pods will
+ be taken into consideration. The keys are used to lookup values from the
+ incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)`
+ to select the group of existing pods which pods will be taken into consideration
+ for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+ pod labels will be ignored. The default value is empty.
+ The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+ Also, MatchLabelKeys cannot be set when LabelSelector isn't set.
+ This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ mismatchLabelKeys:
+ description: |-
+ MismatchLabelKeys is a set of pod label keys to select which pods will
+ be taken into consideration. The keys are used to lookup values from the
+ incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)`
+ to select the group of existing pods which pods will be taken into consideration
+ for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+ pod labels will be ignored. The default value is empty.
+ The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector.
+ Also, MismatchLabelKeys cannot be set when LabelSelector isn't set.
+ This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
  namespaceSelector:
  description: |-
  A label query over the set of namespaces that the term applies to.
@@ -738,8 +831,9 @@ spec:
  a pod of the set of pods is running
  properties:
  labelSelector:
- description: A label query over a set of resources,
- in this case pods.
+ description: |-
+ A label query over a set of resources, in this case pods.
+ If it's null, this PodAffinityTerm matches with no Pods.
  properties:
  matchExpressions:
  description: matchExpressions is a list of label
@@ -783,6 +877,36 @@ spec:
  type: object
  type: object
  x-kubernetes-map-type: atomic
+ matchLabelKeys:
+ description: |-
+ MatchLabelKeys is a set of pod label keys to select which pods will
+ be taken into consideration. The keys are used to lookup values from the
+ incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)`
+ to select the group of existing pods which pods will be taken into consideration
+ for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+ pod labels will be ignored. The default value is empty.
+ The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+ Also, MatchLabelKeys cannot be set when LabelSelector isn't set.
+ This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
+ mismatchLabelKeys:
+ description: |-
+ MismatchLabelKeys is a set of pod label keys to select which pods will
+ be taken into consideration. The keys are used to lookup values from the
+ incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)`
+ to select the group of existing pods which pods will be taken into consideration
+ for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+ pod labels will be ignored. The default value is empty.
+ The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector.
+ Also, MismatchLabelKeys cannot be set when LabelSelector isn't set.
+ This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+ items:
+ type: string
+ type: array
+ x-kubernetes-list-type: atomic
  namespaceSelector:
  description: |-
  A label query over the set of namespaces that the term applies to.