fix: removing nodeclass usage of artifact streaming enabling by default

Azure · May 7, 2024 · 6b99af2 · 6b99af2
1 parent d7e5340
commit 6b99af2
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 13 deletions.
diff --git a/pkg/apis/crds/karpenter.azure.com_aksnodeclasses.yaml b/pkg/apis/crds/karpenter.azure.com_aksnodeclasses.yaml
@@ -46,10 +46,6 @@ spec:
               AKSNodeClassSpec is the top level specification for the AKS Karpenter Provider.
               This will contain configuration necessary to launch instances in AKS.
             properties:
-              artifactStreamingEnabled:
-                default: false
-                description: AritfactStreamingEnabled is a flag to enable https://aka.ms/artifactstreaming
-                type: boolean
               imageFamily:
                 default: Ubuntu2204
                 description: ImageFamily is the image family that instances use.

diff --git a/pkg/apis/v1alpha2/aksnodeclass.go b/pkg/apis/v1alpha2/aksnodeclass.go
@@ -27,9 +27,6 @@ import (
 // AKSNodeClassSpec is the top level specification for the AKS Karpenter Provider.
 // This will contain configuration necessary to launch instances in AKS.
 type AKSNodeClassSpec struct {
-	// AritfactStreamingEnabled is a flag to enable https://aka.ms/artifactstreaming
-	// +kubebuilder:default=false
-	ArtifactStreamingEnabled *bool `json:"artifactStreamingEnabled,omitempty"`
 	// +kubebuilder:default=128
 	// +kubebuilder:validation:Minimum=100
 	// osDiskSizeGB is the size of the OS disk in GB.

diff --git a/pkg/providers/imagefamily/bootstrap/aksbootstrap.go b/pkg/providers/imagefamily/bootstrap/aksbootstrap.go
@@ -385,7 +385,7 @@ var (
 		KubenetTemplate:                 base64.StdEncoding.EncodeToString(kubenetTemplate),                  // s
 		ContainerdConfigContent:         "",                                                                  // kd
 		IsKata:                          false,                                                               // n
-		ArtifactStreamingEnabled:       false,                                                               // td
+		ArtifactStreamingEnabled:       true,                                                               // td
 	}
 )
 
@@ -449,7 +449,6 @@ func (a AKS) applyOptions(nbv *NodeBootstrapVariables) {
 		nbv.GPUDriverVersion = a.GPUDriverVersion
 		nbv.GPUImageSHA = a.GPUImageSHA
 	}
-	nbv.ArtifactStreamingEnabled = a.ArtifactStreamingEnabled
 	nbv.NeedsCgroupV2 = true
 	// merge and stringify labels
 	kubeletLabels := lo.Assign(kubeletNodeLabelsBase, a.Labels)

diff --git a/pkg/providers/imagefamily/bootstrap/bootstrap.go b/pkg/providers/imagefamily/bootstrap/bootstrap.go
@@ -33,7 +33,6 @@ type Options struct {
 	GPUDriverVersion string
 	GPUImageSHA      string
 	SubnetID         string
-	ArtifactStreamingEnabled bool
 }
 
 // Bootstrapper can be implemented to generate a bootstrap script

diff --git a/pkg/providers/imagefamily/ubuntu_2204.go b/pkg/providers/imagefamily/ubuntu_2204.go
@@ -86,7 +86,6 @@ func (u Ubuntu2204) UserData(kubeletConfig *corev1beta1.KubeletConfiguration, ta
 			GPUDriverVersion: u.Options.GPUDriverVersion,
 			GPUImageSHA:      u.Options.GPUImageSHA,
 			SubnetID:         u.Options.SubnetID,
-			ArtifactStreamingEnabled: u.Options.ArtifactStreamingEnabled,		
 		},
 		Arch:                           u.Options.Arch,
 		TenantID:                       u.Options.TenantID,

diff --git a/pkg/providers/launchtemplate/launchtemplate.go b/pkg/providers/launchtemplate/launchtemplate.go
@@ -133,7 +133,6 @@ func (p *Provider) getStaticParameters(ctx context.Context, instanceType *cloudp
 		ClusterName:                    options.FromContext(ctx).ClusterName,
 		ClusterEndpoint:                p.clusterEndpoint,
 		Tags:                           nodeClass.Spec.Tags,
-		ArtifactStreamingEnabled:       lo.FromPtr(nodeClass.Spec.ArtifactStreamingEnabled),
 		Labels:                         labels,
 		CABundle:                       p.caBundle,
 		Arch:                           arch,

diff --git a/pkg/providers/launchtemplate/parameters/types.go b/pkg/providers/launchtemplate/parameters/types.go
@@ -41,7 +41,6 @@ type StaticParameters struct {
 	NetworkPolicy                  string
 	KubernetesVersion              string
 	SubnetID string
-	ArtifactStreamingEnabled bool
 
 	Tags   map[string]string
 	Labels map[string]string