Remove/comment out Windows images on EE

To fix hash release building.
tigera · Sep 18, 2023 · 4614e95 · 4614e95
1 parent f2861b5
commit 4614e95
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/hack/gen-versions/calico.go.tpl b/hack/gen-versions/calico.go.tpl
@@ -39,6 +39,7 @@ var (
 	ComponentCalicoCNIWindows = component{
 		Version: "{{ .Version }}",
 		Image:   "{{ .Image }}",
+		Registry: "{{ .Registry }}",
 	}
 {{- end }}
 {{ with index .Components "calico/kube-controllers" }}
@@ -73,6 +74,7 @@ var (
 	ComponentCalicoNodeWindows = component{
 		Version: "{{ .Version }}",
 		Image:   "{{ .Image }}",
+		Registry: "{{ .Registry }}",
 	}
 {{- end }}
 {{ with .Components.typha }}

diff --git a/hack/gen-versions/enterprise.go.tpl b/hack/gen-versions/enterprise.go.tpl
@@ -312,6 +312,7 @@ var (
 	ComponentTigeraNodeWindows = component{
 		Version: "{{ .Version }}",
 		Image:   "{{ .Image }}",
+		Registry: "{{ .Registry }}",
 	}
 {{- end }}
 {{ with .Components.typha }}
@@ -339,6 +340,7 @@ var (
 	ComponentTigeraCNIWindows = component{
 		Version: "{{ .Version }}",
 		Image:   "{{ .Image }}",
+		Registry: "{{ .Registry }}",
 	}
 {{- end }}
 {{ with index .Components "cloud-controllers" }}
@@ -413,11 +415,9 @@ var (
 		ComponentQueryServer,
 		ComponentTigeraKubeControllers,
 		ComponentTigeraNode,
-		ComponentTigeraNodeWindows,
 		ComponentTigeraTypha,
 		ComponentTigeraCNI,
 		ComponentTigeraCNIFIPS,
-		ComponentTigeraCNIWindows,
 		ComponentCloudControllers,
 		ComponentElasticsearchMetrics,
 		ComponentESGateway,

diff --git a/pkg/components/calico.go b/pkg/components/calico.go
@@ -35,8 +35,9 @@ var (
 	}
 
 	ComponentCalicoCNIWindows = component{
-		Version: "master",
-		Image:   "calico/cni-windows",
+		Version:  "master",
+		Image:    "calico/cni-windows",
+		Registry: "",
 	}
 
 	ComponentCalicoKubeControllers = component{
@@ -64,8 +65,9 @@ var (
 	}
 
 	ComponentCalicoNodeWindows = component{
-		Version: "master",
-		Image:   "calico/node-windows",
+		Version:  "master",
+		Image:    "calico/node-windows",
+		Registry: "",
 	}
 
 	ComponentCalicoTypha = component{

diff --git a/pkg/components/enterprise.go b/pkg/components/enterprise.go
@@ -268,8 +268,9 @@ var (
 	}
 
 	ComponentTigeraNodeWindows = component{
-		Version: "master",
-		Image:   "tigera/cnx-node-windows",
+		Version:  "master",
+		Image:    "tigera/cnx-node-windows",
+		Registry: "",
 	}
 
 	ComponentTigeraTypha = component{
@@ -291,8 +292,9 @@ var (
 	}
 
 	ComponentTigeraCNIWindows = component{
-		Version: "master",
-		Image:   "tigera/cni-windows",
+		Version:  "master",
+		Image:    "tigera/cni-windows",
+		Registry: "",
 	}
 
 	ComponentCloudControllers = component{
@@ -361,11 +363,9 @@ var (
 		ComponentQueryServer,
 		ComponentTigeraKubeControllers,
 		ComponentTigeraNode,
-		ComponentTigeraNodeWindows,
 		ComponentTigeraTypha,
 		ComponentTigeraCNI,
 		ComponentTigeraCNIFIPS,
-		ComponentTigeraCNIWindows,
 		ComponentCloudControllers,
 		ComponentElasticsearchMetrics,
 		ComponentESGateway,

diff --git a/pkg/render/windows.go b/pkg/render/windows.go
@@ -79,8 +79,7 @@ func (c *windowsComponent) ResolveImages(is *operatorv1.ImageSet) error {
 	}
 
 	if c.cfg.Installation.Variant == operatorv1.TigeraSecureEnterprise {
-		c.cniImage = appendIfErr(components.GetReference(components.ComponentTigeraCNIWindows, reg, path, prefix, is))
-		c.nodeImage = appendIfErr(components.GetReference(components.ComponentTigeraNodeWindows, reg, path, prefix, is))
+		return fmt.Errorf("%s is not currently supported on product variant %s", WindowsNodeObjectName, operatorv1.TigeraSecureEnterprise)
 	} else {
 		c.cniImage = appendIfErr(components.GetReference(components.ComponentCalicoCNIWindows, reg, path, prefix, is))
 		c.nodeImage = appendIfErr(components.GetReference(components.ComponentCalicoNodeWindows, reg, path, prefix, is))