Merge branch 'main' into e2e-test-kubeadm-full-etcd

linode · Aug 23, 2024 · bd6cebb · bd6cebb
2 parents 7e7a7af + 8cfd121
commit bd6cebb
Show file tree

Hide file tree

Showing 29 changed files with 1,310 additions and 1,609 deletions.
diff --git a/api/v1alpha2/linodefirewall_types.go b/api/v1alpha2/linodefirewall_types.go
@@ -41,6 +41,7 @@ type LinodeFirewallSpec struct {
 	// +optional
 	InboundRules []FirewallRule `json:"inboundRules,omitempty"`
 
+	// InboundPolicy determines if traffic by default should be ACCEPTed or DROPped. Defaults to ACCEPT if not defined.
 	// +kubebuilder:validation:Enum=ACCEPT;DROP
 	// +kubebuilder:default=ACCEPT
 	// +optional
@@ -49,6 +50,7 @@ type LinodeFirewallSpec struct {
 	// +optional
 	OutboundRules []FirewallRule `json:"outboundRules,omitempty"`
 
+	// OutboundPolicy determines if traffic by default should be ACCEPTed or DROPped. Defaults to ACCEPT if not defined.
 	// +kubebuilder:validation:Enum=ACCEPT;DROP
 	// +kubebuilder:default=ACCEPT
 	// +optional

diff --git a/api/v1alpha2/linodemachine_types.go b/api/v1alpha2/linodemachine_types.go
@@ -68,7 +68,6 @@ type LinodeMachineSpec struct {
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
 	Tags []string `json:"tags,omitempty"`
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
-	// +kubebuilder:deprecatedversion:warning="Firewalls should be referenced via FirewallRef"
 	FirewallID int `json:"firewallID,omitempty"`
 	// OSDisk is configuration for the root disk that includes the OS,
 	// if not specified this defaults to whatever space is not taken up by the DataDisks

diff --git a/clients/clients.go b/clients/clients.go
@@ -64,6 +64,7 @@ type LinodeVPCClient interface {
 type LinodeNodeBalancerClient interface {
 	CreateNodeBalancer(ctx context.Context, opts linodego.NodeBalancerCreateOptions) (*linodego.NodeBalancer, error)
 	GetNodeBalancer(ctx context.Context, nodebalancerID int) (*linodego.NodeBalancer, error)
+	ListNodeBalancerNodes(ctx context.Context, nodebalancerID int, configID int, opts *linodego.ListOptions) ([]linodego.NodeBalancerNode, error)
 	GetNodeBalancerConfig(ctx context.Context, nodebalancerID int, configID int) (*linodego.NodeBalancerConfig, error)
 	CreateNodeBalancerConfig(ctx context.Context, nodebalancerID int, opts linodego.NodeBalancerConfigCreateOptions) (*linodego.NodeBalancerConfig, error)
 	DeleteNodeBalancerNode(ctx context.Context, nodebalancerID int, configID int, nodeID int) error

diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go
@@ -32,9 +32,10 @@ import (
 
 // ClusterScopeParams defines the input parameters used to create a new Scope.
 type ClusterScopeParams struct {
-	Client        K8sClient
-	Cluster       *clusterv1.Cluster
-	LinodeCluster *infrav1alpha2.LinodeCluster
+	Client            K8sClient
+	Cluster           *clusterv1.Cluster
+	LinodeCluster     *infrav1alpha2.LinodeCluster
+	LinodeMachineList infrav1alpha2.LinodeMachineList
 }
 
 func validateClusterScopeParams(params ClusterScopeParams) error {
@@ -50,7 +51,7 @@ func validateClusterScopeParams(params ClusterScopeParams) error {
 
 // NewClusterScope creates a new Scope from the supplied parameters.
 // This is meant to be called for each reconcile iteration.
-func NewClusterScope(ctx context.Context, linodeClientConfig ClientConfig, params ClusterScopeParams) (*ClusterScope, error) {
+func NewClusterScope(ctx context.Context, linodeClientConfig, dnsClientConfig ClientConfig, params ClusterScopeParams) (*ClusterScope, error) {
 	if err := validateClusterScopeParams(params); err != nil {
 		return nil, err
 	}
@@ -63,6 +64,11 @@ func NewClusterScope(ctx context.Context, linodeClientConfig ClientConfig, param
 			return nil, fmt.Errorf("credentials from secret ref: %w", err)
 		}
 		linodeClientConfig.Token = string(apiToken)
+		dnsToken, err := getCredentialDataFromRef(ctx, params.Client, *params.LinodeCluster.Spec.CredentialsRef, params.LinodeCluster.GetNamespace(), "dnsToken")
+		if err != nil || len(dnsToken) == 0 {
+			dnsToken = apiToken
+		}
+		dnsClientConfig.Token = string(dnsToken)
 	}
 	linodeClient, err := CreateLinodeClient(linodeClientConfig)
 	if err != nil {
@@ -74,22 +80,37 @@ func NewClusterScope(ctx context.Context, linodeClientConfig ClientConfig, param
 		return nil, fmt.Errorf("failed to init patch helper: %w", err)
 	}
 
+	akamDomainsClient, err := setUpEdgeDNSInterface()
+	if err != nil {
+		return nil, fmt.Errorf("failed to create akamai dns client: %w", err)
+	}
+	linodeDomainsClient, err := CreateLinodeClient(dnsClientConfig, WithRetryCount(0))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create linode client: %w", err)
+	}
+
 	return &ClusterScope{
-		Client:        params.Client,
-		Cluster:       params.Cluster,
-		LinodeClient:  linodeClient,
-		LinodeCluster: params.LinodeCluster,
-		PatchHelper:   helper,
+		Client:              params.Client,
+		Cluster:             params.Cluster,
+		LinodeClient:        linodeClient,
+		LinodeDomainsClient: linodeDomainsClient,
+		AkamaiDomainsClient: akamDomainsClient,
+		LinodeCluster:       params.LinodeCluster,
+		LinodeMachines:      params.LinodeMachineList,
+		PatchHelper:         helper,
 	}, nil
 }
 
 // ClusterScope defines the basic context for an actuator to operate upon.
 type ClusterScope struct {
-	Client        K8sClient
-	PatchHelper   *patch.Helper
-	LinodeClient  LinodeClient
-	Cluster       *clusterv1.Cluster
-	LinodeCluster *infrav1alpha2.LinodeCluster
+	Client              K8sClient
+	PatchHelper         *patch.Helper
+	LinodeClient        LinodeClient
+	Cluster             *clusterv1.Cluster
+	LinodeCluster       *infrav1alpha2.LinodeCluster
+	LinodeMachines      infrav1alpha2.LinodeMachineList
+	AkamaiDomainsClient AkamClient
+	LinodeDomainsClient LinodeClient
 }
 
 // PatchObject persists the cluster configuration and status.