Address comments

Signed-off-by: Joe Nathan Abellard <[email protected]>
karmada-io · Jul 17, 2024 · 2a1ab1b · 2a1ab1b
1 parent 249b4a4
commit 2a1ab1b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/charts/karmada-operator/crds/operator.karmada.io_karmadas.yaml b/charts/karmada-operator/crds/operator.karmada.io_karmadas.yaml
@@ -1733,7 +1733,7 @@ spec:
               crdDownloadPolicy:
                 default: IfNotPresent
                 description: |-
-                  Policy that should be used by the Karmada operator to retrieve the Karmada CRDs when provisioning this Karmada instance.
+                  CRDDownloadPolicy specifies a policy that should be used by the Karmada operator to retrieve the Karmada CRDs when provisioning this Karmada instance.
                   Valid values are "Always" and "IfNotPresent".
                   Defaults to "IfNotPresent".
                 enum:
@@ -1742,7 +1742,7 @@ spec:
                 type: string
               crdRemoteURL:
                 description: |-
-                  Custom URL that should be used to download required CRDs for this Karmada instance.
+                  CRDRemoteURL specifies the URL that should be used to download required CRDs for this Karmada instance.
                   Omit if the intent is to provision a new Karmada instance with control plane components of the same version as the operator's release version.
                   In that scenario, the CRDs tarball will be downloaded from a release artifact on GitHub that's of the same version as the operator's release version.
                   When that is not the intent, this field should be explicitly set to ensure the right version of the CRDs is installed for this Karmada instance.

diff --git a/operator/config/crds/operator.karmada.io_karmadas.yaml b/operator/config/crds/operator.karmada.io_karmadas.yaml
@@ -1733,7 +1733,7 @@ spec:
               crdDownloadPolicy:
                 default: IfNotPresent
                 description: |-
-                  Policy that should be used by the Karmada operator to retrieve the Karmada CRDs when provisioning this Karmada instance.
+                  CRDDownloadPolicy specifies a policy that should be used by the Karmada operator to retrieve the Karmada CRDs when provisioning this Karmada instance.
                   Valid values are "Always" and "IfNotPresent".
                   Defaults to "IfNotPresent".
                 enum:
@@ -1742,7 +1742,7 @@ spec:
                 type: string
               crdRemoteURL:
                 description: |-
-                  Custom URL that should be used to download required CRDs for this Karmada instance.
+                  CRDRemoteURL specifies the URL that should be used to download required CRDs for this Karmada instance.
                   Omit if the intent is to provision a new Karmada instance with control plane components of the same version as the operator's release version.
                   In that scenario, the CRDs tarball will be downloaded from a release artifact on GitHub that's of the same version as the operator's release version.
                   When that is not the intent, this field should be explicitly set to ensure the right version of the CRDs is installed for this Karmada instance.

diff --git a/operator/pkg/apis/operator/v1alpha1/type.go b/operator/pkg/apis/operator/v1alpha1/type.go
@@ -83,20 +83,20 @@ type KarmadaSpec struct {
 	// +optional
 	FeatureGates map[string]bool `json:"featureGates,omitempty"`
 
-	// Custom URL that should be used to download required CRDs for this Karmada instance.
+	// CRDRemoteURL specifies the URL that should be used to download required CRDs for this Karmada instance.
 	// Omit if the intent is to provision a new Karmada instance with control plane components of the same version as the operator's release version.
 	// In that scenario, the CRDs tarball will be downloaded from a release artifact on GitHub that's of the same version as the operator's release version.
 	// When that is not the intent, this field should be explicitly set to ensure the right version of the CRDs is installed for this Karmada instance.
 	// +optional
-	CRDRemoteURL string `json:"crdRemoteURL,omitempty"`
+	CRDRemoteURL *string `json:"crdRemoteURL,omitempty"`
 
-	// Policy that should be used by the Karmada operator to retrieve the Karmada CRDs when provisioning this Karmada instance.
+	// CRDDownloadPolicy specifies a policy that should be used by the Karmada operator to retrieve the Karmada CRDs when provisioning this Karmada instance.
 	// Valid values are "Always" and "IfNotPresent".
 	// Defaults to "IfNotPresent".
 	// +kubebuilder:validation:Enum=Always;IfNotPresent
 	// +kubebuilder:default=IfNotPresent
 	// +optional
-	CRDDownloadPolicy CRDDownloadPolicy `json:"crdDownloadPolicy,omitempty"`
+	CRDDownloadPolicy *CRDDownloadPolicy `json:"crdDownloadPolicy,omitempty"`
 }
 
 // ImageRegistry represents an image registry as well as the

diff --git a/operator/pkg/apis/operator/v1alpha1/zz_generated.deepcopy.go b/operator/pkg/apis/operator/v1alpha1/zz_generated.deepcopy.go
diff --git a/operator/pkg/init.go b/operator/pkg/init.go
@@ -290,10 +290,12 @@ func NewInitOptWithKarmada(karmada *operatorv1alpha1.Karmada) InitOpt {
 		o.Karmada = karmada
 		o.Name = karmada.GetName()
 		o.Namespace = karmada.GetNamespace()
-		if len(karmada.Spec.CRDRemoteURL) > 0 {
-			o.CRDRemoteURL = karmada.Spec.CRDRemoteURL
+		if karmada.Spec.CRDRemoteURL != nil && len(*karmada.Spec.CRDRemoteURL) > 0 {
+			o.CRDRemoteURL = *karmada.Spec.CRDRemoteURL
+		}
+		if karmada.Spec.CRDDownloadPolicy != nil {
+			o.CRDDownloadPolicy = *karmada.Spec.CRDDownloadPolicy
 		}
-		o.CRDDownloadPolicy = karmada.Spec.CRDDownloadPolicy
 	}
 }