[release/v1.10] Fix validation to pass when ChartURL is given (#3825)

* Fix validation to pass when ChartURL is given

Signed-off-by: Artiom Diomin <[email protected]>

* Shutup govet, I want to have this varibale shadow

Signed-off-by: Artiom Diomin <[email protected]>

---------

Signed-off-by: Artiom Diomin <[email protected]>
Co-authored-by: Artiom Diomin <[email protected]>

Author: kubermatic-bot

pkg/apis/kubeone/validation/validation.go

@@ -725,22 +725,27 @@ func ValidateAddons(o *kubeoneapi.Addons, fldPath *field.Path) field.ErrorList {
 func validateHelmReleases(helmReleases []kubeoneapi.HelmRelease, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 
-	for _, hr := range helmReleases {
-		if hr.Chart == "" {
+	for i, hr := range helmReleases {
+		fldPath := fldPath.Index(i) //nolint:govet
+		if hr.Chart == "" && hr.ChartURL == "" {
 			allErrs = append(allErrs, field.Required(fldPath.Child("chart"), hr.Chart))
 		}
 
 		if hr.Namespace == "" {
 			allErrs = append(allErrs, field.Required(fldPath.Child("namespace"), hr.Namespace))
 		}
 
-		if hr.RepoURL == "" {
+		if hr.RepoURL == "" && hr.ChartURL == "" {
 			_, err := helm.GetChartNameFromChartYAML(hr.Chart)
 			if err != nil {
 				allErrs = append(allErrs, field.Invalid(fldPath.Child("chart"), hr.Chart, fmt.Sprintf("invalid local chart: %v", err)))
 			}
 		}
 
+		if hr.ChartURL != "" && hr.ReleaseName == "" {
+			allErrs = append(allErrs, field.Required(fldPath.Child("releaseName"), "since chartURL is given directly, releaseName is required"))
+		}
+
 		for idx, helmValues := range hr.Values {
 			fldIdentity := fldPath.Child("values").Index(idx)
 

pkg/apis/kubeone/validation/validation_test.go

@@ -2086,12 +2086,56 @@ func TestValidateAddons(t *testing.T) {
 			addons:        nil,
 			expectedError: false,
 		},
+		{
+			name: "oci helm release",
+			addons: &kubeoneapi.Addons{
+				Addons: []kubeoneapi.AddonRef{
+					{
+						HelmRelease: &kubeoneapi.HelmRelease{
+							Namespace:   "ns1",
+							ChartURL:    "oci://something.tld/chart:version",
+							ReleaseName: "chart1",
+						},
+					},
+				},
+			},
+			expectedError: false,
+		},
+		{
+			name: "oci helm release without releaseName",
+			addons: &kubeoneapi.Addons{
+				Addons: []kubeoneapi.AddonRef{
+					{
+						HelmRelease: &kubeoneapi.HelmRelease{
+							Namespace: "ns1",
+							ChartURL:  "oci://something.tld/chart:version",
+						},
+					},
+				},
+			},
+			expectedError: true,
+		},
+		{
+			name: "helm release",
+			addons: &kubeoneapi.Addons{
+				Addons: []kubeoneapi.AddonRef{
+					{
+						HelmRelease: &kubeoneapi.HelmRelease{
+							Namespace: "ns1",
+							Chart:     "chart",
+							RepoURL:   "https://repo.localhost/chart-repo",
+						},
+					},
+				},
+			},
+			expectedError: false,
+		},
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			errs := ValidateAddons(tc.addons, nil)
 			if (len(errs) == 0) == tc.expectedError {
-				t.Log(errs[0])
+				t.Log(errs)
 				t.Errorf("test case failed: expected %v, but got %v", tc.expectedError, (len(errs) != 0))
 			}
 		})