Skip to content

wip: capi v1.11 bump #189

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

wip: capi v1.11 bump #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions bootstrap/api/v1beta1/condition_consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

package v1beta1

import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
import clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"

// Conditions and condition Reasons for the KThreesConfig object.

Expand All @@ -26,7 +26,7 @@ const (
// NOTE: When the DataSecret generation starts the process completes immediately and within the
// same reconciliation, so the user will always see a transition from Wait to Generated without having
// evidence that BootstrapSecret generation is started/in progress.
DataSecretAvailableCondition clusterv1.ConditionType = "DataSecretAvailable"
DataSecretAvailableCondition clusterv1beta1.ConditionType = "DataSecretAvailable"

// WaitingForClusterInfrastructureReason (Severity=Info) document a bootstrap secret generation process
// waiting for the cluster infrastructure to be ready.
Expand All @@ -43,7 +43,7 @@ const (
// Deprecated: This has been deprecated in v1beta1 and will be removed in a future version.
// Switch to WaitingForControlPlaneAvailableReason constant from the `sigs.k8s.io/cluster-api/api/v1beta1`
// package.
WaitingForControlPlaneAvailableReason = clusterv1.WaitingForControlPlaneAvailableReason
WaitingForControlPlaneAvailableReason = clusterv1beta1.WaitingForControlPlaneAvailableReason

// DataSecretGenerationFailedReason (Severity=Warning) documents a KThreesConfig controller detecting
// an error while generating a data secret; those kind of errors are usually due to misconfigurations
Expand All @@ -58,7 +58,7 @@ const (
// machine, if the cluster is not using a control plane ref object, if the certificates are not provided
// by the users.
// IMPORTANT: This condition won't be re-created after clusterctl move.
CertificatesAvailableCondition clusterv1.ConditionType = "CertificatesAvailable"
CertificatesAvailableCondition clusterv1beta1.ConditionType = "CertificatesAvailable"

// CertificatesGenerationFailedReason (Severity=Warning) documents a KThreesConfig controller detecting
// an error while generating certificates; those kind of errors are usually temporary and the controller
Expand Down
8 changes: 4 additions & 4 deletions bootstrap/api/v1beta1/kthreesconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package v1beta1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
)

// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
Expand Down Expand Up @@ -173,7 +173,7 @@ type KThreesConfigStatus struct {

// Conditions defines current service state of the KThreesConfig.
// +optional
Conditions clusterv1.Conditions `json:"conditions,omitempty"`
Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`
}

// +kubebuilder:object:root=true
Expand All @@ -188,11 +188,11 @@ type KThreesConfig struct {
Status KThreesConfigStatus `json:"status,omitempty"`
}

func (c *KThreesConfig) GetConditions() clusterv1.Conditions {
func (c *KThreesConfig) GetConditions() clusterv1beta1.Conditions {
return c.Status.Conditions
}

func (c *KThreesConfig) SetConditions(conditions clusterv1.Conditions) {
func (c *KThreesConfig) SetConditions(conditions clusterv1beta1.Conditions) {
c.Status.Conditions = conditions
}

Expand Down
4 changes: 2 additions & 2 deletions bootstrap/api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions bootstrap/api/v1beta2/condition_consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

package v1beta2

import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
import clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"

// Conditions and condition Reasons for the KThreesConfig object.

Expand All @@ -26,7 +26,7 @@ const (
// NOTE: When the DataSecret generation starts the process completes immediately and within the
// same reconciliation, so the user will always see a transition from Wait to Generated without having
// evidence that BootstrapSecret generation is started/in progress.
DataSecretAvailableCondition clusterv1.ConditionType = "DataSecretAvailable"
DataSecretAvailableCondition clusterv1beta1.ConditionType = "DataSecretAvailable"

// WaitingForClusterInfrastructureReason (Severity=Info) document a bootstrap secret generation process
// waiting for the cluster infrastructure to be ready.
Expand All @@ -43,7 +43,7 @@ const (
// Deprecated: This has been deprecated in v1beta1 and will be removed in a future version.
// Switch to WaitingForControlPlaneAvailableReason constant from the `sigs.k8s.io/cluster-api/api/v1beta1`
// package.
WaitingForControlPlaneAvailableReason = clusterv1.WaitingForControlPlaneAvailableReason
WaitingForControlPlaneAvailableReason = clusterv1beta1.WaitingForControlPlaneAvailableReason

// DataSecretGenerationFailedReason (Severity=Warning) documents a KThreesConfig controller detecting
// an error while generating a data secret; those kind of errors are usually due to misconfigurations
Expand All @@ -58,7 +58,7 @@ const (
// machine, if the cluster is not using a control plane ref object, if the certificates are not provided
// by the users.
// IMPORTANT: This condition won't be re-created after clusterctl move.
CertificatesAvailableCondition clusterv1.ConditionType = "CertificatesAvailable"
CertificatesAvailableCondition clusterv1beta1.ConditionType = "CertificatesAvailable"

// CertificatesGenerationFailedReason (Severity=Warning) documents a KThreesConfig controller detecting
// an error while generating certificates; those kind of errors are usually temporary and the controller
Expand Down
53 changes: 49 additions & 4 deletions bootstrap/api/v1beta2/kthreesconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package v1beta2

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
)

// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
Expand Down Expand Up @@ -195,7 +195,36 @@ type KThreesConfigStatus struct {

// Conditions defines current service state of the KThreesConfig.
// +optional
Conditions clusterv1.Conditions `json:"conditions,omitempty"`
Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`

// v1beta2 groups all the fields that will be added or modified in KThreesConfig's status with the V1Beta2 version.
// +optional
V1Beta2 *KThreesConfigV1Beta2Status `json:"v1beta2,omitempty"`

// initialization provides observations of the KThreesConfig initialization process.
// NOTE: Fields in this struct are part of the Cluster API contract and are used to orchestrate initial Machine provisioning.
// +optional
Initialization KThreesConfigInitializationStatus `json:"initialization,omitempty,omitzero"`
}

// KThreesConfigInitializationStatus provides observations of the KThreesConfig initialization process.
type KThreesConfigInitializationStatus struct {
// dataSecretCreated is true when the Machine's boostrap secret is created.
// NOTE: this field is part of the Cluster API contract, and it is used to orchestrate initial Machine provisioning.
// +optional
DataSecretCreated bool `json:"dataSecretCreated,omitempty"`
}

// KThreesConfigV1Beta2Status groups all the fields that will be added or modified in KThreesConfigStatus with the V1Beta2 version.
// See https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more context.
type KThreesConfigV1Beta2Status struct {
// conditions represents the observations of a KThreesConfig's current state.
// Known condition types are Ready, Paused.
// +optional
// +listType=map
// +listMapKey=type
// +kubebuilder:validation:MaxItems=32
Conditions []metav1.Condition `json:"conditions,omitempty"`
}

// +kubebuilder:object:root=true
Expand All @@ -211,14 +240,30 @@ type KThreesConfig struct {
Status KThreesConfigStatus `json:"status,omitempty"`
}

func (c *KThreesConfig) GetConditions() clusterv1.Conditions {
func (c *KThreesConfig) GetConditions() clusterv1beta1.Conditions {
return c.Status.Conditions
}

func (c *KThreesConfig) SetConditions(conditions clusterv1.Conditions) {
func (c *KThreesConfig) SetConditions(conditions clusterv1beta1.Conditions) {
c.Status.Conditions = conditions
}

// GetV1Beta2Conditions returns the set of conditions for this object.
func (c *KThreesConfig) GetV1Beta2Conditions() []metav1.Condition {
if c.Status.V1Beta2 == nil {
return nil
}
return c.Status.V1Beta2.Conditions
}

// SetV1Beta2Conditions sets conditions for an API object.
func (c *KThreesConfig) SetV1Beta2Conditions(conditions []metav1.Condition) {
if c.Status.V1Beta2 == nil {
c.Status.V1Beta2 = &KThreesConfigV1Beta2Status{}
}
c.Status.V1Beta2.Conditions = conditions
}

// +kubebuilder:object:root=true

// KThreesConfigList contains a list of KThreesConfig.
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/api/v1beta2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 24 additions & 22 deletions bootstrap/controllers/kthreesconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@
"k8s.io/apimachinery/pkg/types"
kerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/utils/ptr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
bsutil "sigs.k8s.io/cluster-api/bootstrap/util"
"sigs.k8s.io/cluster-api/util"
"sigs.k8s.io/cluster-api/util/annotations"
"sigs.k8s.io/cluster-api/util/conditions"
v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions" //nolint:staticcheck
"sigs.k8s.io/cluster-api/util/patch"
"sigs.k8s.io/cluster-api/util/predicates"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -153,8 +155,8 @@
defer func() {
// always update the readyCondition; the summary is represented using the "1 of x completed" notation.

conditions.SetSummary(config,
conditions.WithConditions(
v1beta1conditions.SetSummary(config,
v1beta1conditions.WithConditions(
bootstrapv1.DataSecretAvailableCondition,
bootstrapv1.CertificatesAvailableCondition,
),
Expand All @@ -175,16 +177,16 @@

switch {
// Wait for the infrastructure to be ready.
case !cluster.Status.InfrastructureReady:
case !ptr.Deref(cluster.Status.Initialization.InfrastructureProvisioned, false):
log.Info("Cluster infrastructure is not ready, waiting")
conditions.MarkFalse(config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.WaitingForClusterInfrastructureReason, clusterv1.ConditionSeverityInfo, "")
v1beta1conditions.MarkFalse(config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.WaitingForClusterInfrastructureReason, clusterv1beta1.ConditionSeverityInfo, "")
return ctrl.Result{RequeueAfter: 1 * time.Minute}, nil
// Reconcile status for machines that already have a secret reference, but our status isn't up to date.
// This case solves the pivoting scenario (or a backup restore) which doesn't preserve the status subresource on objects.
case configOwner.DataSecretName() != nil && (!config.Status.Ready || config.Status.DataSecretName == nil):
case configOwner.DataSecretName() != nil && (!ptr.Deref(config.Status.Initialization.DataSecretCreated, false) || config.Status.DataSecretName == ""):

Check failure on line 186 in bootstrap/controllers/kthreesconfig_controller.go

View workflow job for this annotation

GitHub Actions / Validate lint 

in call to ptr.Deref, type bool of config.Status.Initialization.DataSecretCreated does not match *T (cannot infer T) (typecheck)
config.Status.Ready = true
config.Status.DataSecretName = configOwner.DataSecretName()
conditions.MarkTrue(config, bootstrapv1.DataSecretAvailableCondition)
v1beta1conditions.MarkTrue(config, bootstrapv1.DataSecretAvailableCondition)
return ctrl.Result{}, nil
// Status is ready means a config has been generated.
case config.Status.Ready:
Expand All @@ -193,7 +195,7 @@
}

// Note: can't use IsFalse here because we need to handle the absence of the condition as well as false.
if !conditions.IsTrue(cluster, clusterv1.ControlPlaneInitializedCondition) {
if !conditions.IsTrue(cluster, clusterv1.ClusterControlPlaneInitializedCondition) {
return r.handleClusterNotInitialized(ctx, scope)
}

Expand Down Expand Up @@ -225,7 +227,7 @@

tokn, err := token.Lookup(ctx, r.Client, client.ObjectKeyFromObject(scope.Cluster))
if err != nil {
conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, err.Error())
return err
}

Expand All @@ -247,14 +249,14 @@

files, err := r.resolveFiles(ctx, scope.Config)
if err != nil {
conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, err.Error())
return err
}

if scope.Config.Spec.IsEtcdEmbedded() {
etcdProxyFile, err := r.resolveEtcdProxyFile(scope.Config)
if err != nil {
conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, err.Error())
return fmt.Errorf("failed to resolve etcd proxy file: %w", err)
}

Expand Down Expand Up @@ -298,7 +300,7 @@

tokn, err := token.Lookup(ctx, r.Client, client.ObjectKeyFromObject(scope.Cluster))
if err != nil {
conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, err.Error())
return err
}

Expand All @@ -318,7 +320,7 @@

files, err := r.resolveFiles(ctx, scope.Config)
if err != nil {
conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, err.Error())
return err
}

Expand Down Expand Up @@ -421,8 +423,8 @@
// initialize the DataSecretAvailableCondition if missing.
// this is required in order to avoid the condition's LastTransitionTime to flicker in case of errors surfacing
// using the DataSecretGeneratedFailedReason
if conditions.GetReason(scope.Config, bootstrapv1.DataSecretAvailableCondition) != bootstrapv1.DataSecretGenerationFailedReason {
conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, clusterv1.WaitingForControlPlaneAvailableReason, clusterv1.ConditionSeverityInfo, "")
if v1beta1conditions.GetReason(scope.Config, bootstrapv1.DataSecretAvailableCondition) != bootstrapv1.DataSecretGenerationFailedReason {
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, clusterv1beta1.WaitingForControlPlaneAvailableReason, clusterv1beta1.ConditionSeverityInfo, "")
}

// if it's NOT a control plane machine, requeue
Expand Down Expand Up @@ -465,10 +467,10 @@
*metav1.NewControllerRef(scope.Config, bootstrapv1.GroupVersion.WithKind("KThreesConfig")),
)
if err != nil {
conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableCondition, bootstrapv1.CertificatesGenerationFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableCondition, bootstrapv1.CertificatesGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, err.Error())
return ctrl.Result{}, err
}
conditions.MarkTrue(scope.Config, bootstrapv1.CertificatesAvailableCondition)
v1beta1conditions.MarkTrue(scope.Config, bootstrapv1.CertificatesAvailableCondition)

token, err := token.Lookup(ctx, r.Client, client.ObjectKeyFromObject(scope.Cluster))
if err != nil {
Expand Down Expand Up @@ -497,14 +499,14 @@

files, err := r.resolveFiles(ctx, scope.Config)
if err != nil {
conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, err.Error())
return ctrl.Result{}, err
}

if scope.Config.Spec.IsEtcdEmbedded() {
etcdProxyFile, err := r.resolveEtcdProxyFile(scope.Config)
if err != nil {
conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableCondition, bootstrapv1.DataSecretGenerationFailedReason, clusterv1beta1.ConditionSeverityWarning, err.Error())
return ctrl.Result{}, fmt.Errorf("failed to resolve etcd proxy file: %w", err)
}
files = append(files, *etcdProxyFile)
Expand Down Expand Up @@ -590,16 +592,16 @@

scope.Config.Status.DataSecretName = ptr.To[string](secret.Name)
scope.Config.Status.Ready = true
conditions.MarkTrue(scope.Config, bootstrapv1.DataSecretAvailableCondition)
v1beta1conditions.MarkTrue(scope.Config, bootstrapv1.DataSecretAvailableCondition)
return nil
}

func (r *KThreesConfigReconciler) reconcileTopLevelObjectSettings(_ *clusterv1.Cluster, machine *clusterv1.Machine, config *bootstrapv1.KThreesConfig) {
log := r.Log.WithValues("kthreesconfig", fmt.Sprintf("%s/%s", config.Namespace, config.Name))

// If there are no Version settings defined in Config, use Version from machine, if defined
if config.Spec.Version == "" && machine.Spec.Version != nil {
config.Spec.Version = *machine.Spec.Version
if config.Spec.Version == "" && machine.Spec.Version != "" {
config.Spec.Version = machine.Spec.Version
log.Info("Altering Config", "Version", config.Spec.Version)
}
}
Loading
Loading