Integrate windows dev plans into the VsphereCluster as a standard wor…

…kload option Signed-off-by: jay vyas <jvyas@vmware.com>
jayunit100 · Oct 3, 2021 · b9218ad · b9218ad
1 parent 2d678f4
commit b9218ad
Show file tree

Hide file tree

Showing 23 changed files with 728 additions and 6,505 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -55,8 +55,6 @@ linters-settings:
           - (github.com/aunum/log").Warnf
           - (github.com/aunum/log").Errorf
           - (github.com/aunum/log").Fatalf
-  maligned:
-    suggest-new: true
   misspell:
     locale: US
   nolintlint:

diff --git a/pkg/v1/providers/config.yaml b/pkg/v1/providers/config.yaml
@@ -8,9 +8,6 @@ providers:
   - name: vsphere
     url: providers/infrastructure-vsphere/v0.7.10/infrastructure-components.yaml
     type: InfrastructureProvider
-  - name: windows-vsphere
-    url: providers/infrastructure-windows-vsphere/v0.7.8/infrastructure-components.yaml
-    type: InfrastructureProvider
   - name: azure
     url: providers/infrastructure-azure/v0.4.15/infrastructure-components.yaml
     type: InfrastructureProvider

diff --git a/pkg/v1/providers/config_default.yaml b/pkg/v1/providers/config_default.yaml
@@ -90,9 +90,12 @@ VSPHERE_NETWORK: VM Network
 #! necessary except to disambiguate among 2 or more applicable VM templates.
 VSPHERE_TEMPLATE:
 
+
+#! WINDOWS PARAMETERS
 #! The name of the VM Windows template to be used to create a specific version of
 #! a Tanzu Kubernetes Cluster including WINDOWS node.
-VSPHERE_WINDOWS_TEMPLATE:
+VSPHERE_WINDOWS_TEMPLATE: ""
+IS_WINDOWS_WORKLOAD_CLUSTER: false
 
 VIP_NETWORK_INTERFACE: "eth0"
 

diff --git a/....7.8/cluster-template-definition-dev.yaml → ...ster-template-definition-dev-windows.yaml b/....7.8/cluster-template-definition-dev.yaml → ...ster-template-definition-dev-windows.yaml
@@ -2,8 +2,8 @@ apiVersion: providers.tanzu.vmware.com/v1alpha1
 kind: TemplateDefinition
 spec:
   paths:
-    - path: providers/infrastructure-windows-vsphere/v0.7.8/ytt
-    - path: providers/infrastructure-windows-vsphere/ytt
+    - path: providers/infrastructure-vsphere/v0.7.10/ytt
+    - path: providers/infrastructure-vsphere/ytt
     - path: providers/ytt
     - path: bom
       filemark: text-plain