Fix registry IP during restores (#240)

* fix 'non-ha' logic

* fix docker-registry unit test

* refactor for readability

Author: laverya

controllers/helm.go

@@ -123,6 +123,7 @@ func updateInfraChartsFromInstall(ctx context.Context, in *v1beta1.Installation,
 	if in == nil {
 		return charts
 	}
+	serviceCIDR := util.ClusterServiceCIDR(clusterConfig, in)
 
 	for i, chart := range charts {
 		if chart.Name == "admin-console" {
@@ -182,11 +183,11 @@ func updateInfraChartsFromInstall(ctx context.Context, in *v1beta1.Installation,
 			charts[i].Values = newVals
 		}
 		if chart.Name == "docker-registry" {
-			if !in.Spec.AirGap || !in.Spec.HighAvailability {
+			if !in.Spec.AirGap {
 				continue
 			}
 
-			serviceCIDR := util.ClusterServiceCIDR(clusterConfig, in)
+			// handle the registry IP, which will always be present in airgap
 			registryEndpoint, err := registry.GetRegistryServiceIP(serviceCIDR)
 			if err != nil {
 				log.Error(err, "failed to get registry endpoint", "chart", chart.Name)
@@ -197,7 +198,13 @@ func updateInfraChartsFromInstall(ctx context.Context, in *v1beta1.Installation,
 			if err != nil {
 				log.Error(err, "failed to set helm values service.clusterIP", "chart", chart.Name)
 			}
+			charts[i].Values = newVals
+
+			if !in.Spec.HighAvailability {
+				continue
+			}
 
+			// handle the seaweedFS endpoint, which will only be present in HA airgap
 			seaweedfsS3Endpoint, err := registry.GetSeaweedfsS3Endpoint(serviceCIDR)
 			if err != nil {
 				log.Error(err, "failed to get seaweedfs s3 endpoint", "chart", chart.Name)

controllers/helm_test.go

@@ -1463,20 +1463,21 @@ func Test_updateInfraChartsFromInstall(t *testing.T) {
 						ClusterID:  "testid",
 						BinaryName: "testbin",
 						AirGap:     true,
+						Network:    &v1beta1.NetworkSpec{ServiceCIDR: "1.2.0.0/16"},
 					},
 				},
 				clusterConfig: k0sv1beta1.ClusterConfig{},
 				charts: []k0sv1beta1.Chart{
 					{
 						Name:   "docker-registry",
-						Values: "this: that\nand: another\n",
+						Values: "this: that\nand: another\nservice:\n  clusterIP: \"abc\"\n",
 					},
 				},
 			},
 			want: []k0sv1beta1.Chart{
 				{
 					Name:   "docker-registry",
-					Values: "this: that\nand: another\n",
+					Values: "and: another\nservice:\n  clusterIP: 1.2.0.11\nthis: that\n",
 				},
 			},
 		},