Merge pull request #54 from abhinavdahiya/tnco_to_mco

update for installconfig discovery
openshift · Sep 12, 2018 · 27e4db7 · 27e4db7
2 parents 4d40db1 + ccc5a8d
commit 27e4db7
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 25 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/operator/bootstrap.go b/pkg/operator/bootstrap.go
@@ -38,7 +38,7 @@ func RenderBootstrap(
 
 	mcoconfig, err := discoverMCOConfig(getInstallConfigFromFile(filesData[clusterConfigConfigMapFile]))
 	if err != nil {
-		return fmt.Errorf("error discovering MCOConfig from %q", clusterConfigConfigMapFile)
+		return fmt.Errorf("error discovering MCOConfig from %q: %v", clusterConfigConfigMapFile, err)
 	}
 
 	obji, err := runtime.Decode(scheme.Codecs.UniversalDecoder(corev1.SchemeGroupVersion), filesData[imagesConfigMapFile])

diff --git a/pkg/operator/render_test.go b/pkg/operator/render_test.go
@@ -62,12 +62,8 @@ metadata:
   creationTimestamp: null
   name: test-0
 networking:
-  podCIDR:
-    IP: 10.2.0.0
-    Mask: //8AAA==
-  serviceCIDR:
-    IP: 10.3.0.0
-    Mask: //8AAA==
+  podCIDR: 10.2.0.0/16
+  serviceCIDR: 10.3.0.0/16
   type: flannel
 platform:
   libvirt:

diff --git a/vendor/github.com/openshift/installer/pkg/ipnet/ipnet.go b/vendor/github.com/openshift/installer/pkg/ipnet/ipnet.go
diff --git a/vendor/github.com/openshift/installer/pkg/types/installconfig.go b/vendor/github.com/openshift/installer/pkg/types/installconfig.go
diff --git a/vendor/github.com/openshift/installer/pkg/types/machinepools.go b/vendor/github.com/openshift/installer/pkg/types/machinepools.go
diff --git a/...aller/steps/joining_workers/aws/config.tf → ...shift/installer/steps/infra/aws/config.tf b/...aller/steps/joining_workers/aws/config.tf → ...shift/installer/steps/infra/aws/config.tf
diff --git a/...teps/joining_workers/aws/variables-aws.tf → ...nstaller/steps/infra/aws/variables-aws.tf b/...teps/joining_workers/aws/variables-aws.tf → ...nstaller/steps/infra/aws/variables-aws.tf
diff --git a/...r/steps/joining_workers/libvirt/config.tf → ...t/installer/steps/infra/libvirt/config.tf b/...r/steps/joining_workers/libvirt/config.tf → ...t/installer/steps/infra/libvirt/config.tf
diff --git a/...ning_workers/libvirt/variables-libvirt.tf → .../steps/infra/libvirt/variables-libvirt.tf b/...ning_workers/libvirt/variables-libvirt.tf → .../steps/infra/libvirt/variables-libvirt.tf
diff --git a/vendor/github.com/openshift/installer/steps/masters/aws/config.tf b/vendor/github.com/openshift/installer/steps/masters/aws/config.tf
diff --git a/vendor/github.com/openshift/installer/steps/masters/aws/variables-aws.tf b/vendor/github.com/openshift/installer/steps/masters/aws/variables-aws.tf
diff --git a/vendor/github.com/openshift/installer/steps/masters/libvirt/config.tf b/vendor/github.com/openshift/installer/steps/masters/libvirt/config.tf
diff --git a/vendor/github.com/openshift/installer/steps/masters/libvirt/variables-libvirt.tf b/vendor/github.com/openshift/installer/steps/masters/libvirt/variables-libvirt.tf
diff --git a/vendor/github.com/openshift/installer/steps/topology/aws/config.tf b/vendor/github.com/openshift/installer/steps/topology/aws/config.tf
diff --git a/vendor/github.com/openshift/installer/steps/topology/aws/variables-aws.tf b/vendor/github.com/openshift/installer/steps/topology/aws/variables-aws.tf
diff --git a/vendor/github.com/openshift/installer/steps/topology/libvirt/config.tf b/vendor/github.com/openshift/installer/steps/topology/libvirt/config.tf
diff --git a/vendor/github.com/openshift/installer/steps/topology/libvirt/variables-libvirt.tf b/vendor/github.com/openshift/installer/steps/topology/libvirt/variables-libvirt.tf