Merge pull request openshift#7947 from shiftstack/alongside_capi

NO-JIRA: Minor fixes

Author: openshift-merge-bot[bot]

data/data/manifests/openshift/90-okd-sca-pull-disable.yaml.template

@@ -1,6 +1,6 @@
 {{if .IsOKD -}}
-kind: Secret
 apiVersion: v1
+kind: Secret
 metadata:
   name: support
   namespace: openshift-config

data/data/manifests/openshift/cloud-creds-secret.yaml.template

@@ -1,22 +1,4 @@
-kind: Secret
 apiVersion: v1
-metadata:
-  namespace: kube-system
-{{- if .CloudCreds.AWS}}
-  name: aws-creds
-{{- else if .CloudCreds.Azure}}
-  name: azure-credentials
-{{- else if .CloudCreds.GCP}}
-  name: gcp-credentials
-{{- else if .CloudCreds.IBMCloud}}
-  name: ibmcloud-credentials
-{{- else if .CloudCreds.OpenStack}}
-  name: openstack-credentials
-{{- else if .CloudCreds.VSphere}}
-  name: vsphere-creds
-{{- else if .CloudCreds.Ovirt}}
-  name: ovirt-credentials
-{{- end}}
 data:
 {{- if .CloudCreds.AWS}}
   aws_access_key_id: {{.CloudCreds.AWS.Base64encodeAccessKeyID}}
@@ -48,3 +30,21 @@ data:
   ovirt_insecure: {{.CloudCreds.Ovirt.Base64encodeInsecure}}
   ovirt_ca_bundle: {{.CloudCreds.Ovirt.Base64encodeCABundle}}
 {{- end}}
+kind: Secret
+metadata:
+  namespace: kube-system
+{{- if .CloudCreds.AWS}}
+  name: aws-creds
+{{- else if .CloudCreds.Azure}}
+  name: azure-credentials
+{{- else if .CloudCreds.GCP}}
+  name: gcp-credentials
+{{- else if .CloudCreds.IBMCloud}}
+  name: ibmcloud-credentials
+{{- else if .CloudCreds.OpenStack}}
+  name: openstack-credentials
+{{- else if .CloudCreds.VSphere}}
+  name: vsphere-creds
+{{- else if .CloudCreds.Ovirt}}
+  name: ovirt-credentials
+{{- end}}

data/data/manifests/openshift/kubeadmin-password-secret.yaml.template

@@ -1,7 +1,7 @@
-kind: Secret
 apiVersion: v1
+data:
+  kubeadmin: {{.Base64EncodedKubeadminPwHash}}
+kind: Secret
 metadata:
   namespace: kube-system
   name: kubeadmin
-data:
-  kubeadmin: {{.Base64EncodedKubeadminPwHash}}

data/data/manifests/openshift/role-cloud-creds-secret-reader.yaml.template

@@ -1,5 +1,5 @@
-kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
 metadata:
   namespace: kube-system
 {{- if .CloudCreds.AWS}}

docs/dev/cluster-api.md

@@ -26,7 +26,7 @@ The Cluster API system is formed of a set of binaries. The core Cluster API mana
 The binaries are built and packaged during the standard installer build process, `hack/build.sh`. Cluster API specific build flow is contained in the `hack/build-cluster-api.sh` script:
 - Only enabled if the `OPENSHIFT_INSTALL_CLUSTER_API` environment variable is set.
 - Builds (as needed) every binary listed as a Go Module in  the `cluster-api` folder.
-- Downloads (as needed) the specified version of `envtest` to pacakge `kube-apiserver` and `etcd`.
+- Downloads (as needed) the specified version of `envtest` to package `kube-apiserver` and `etcd`.
 - Produces a single `cluster-api.zip` file which is then copied in `pkg/clusterapi/mirror`.
 
 To build an `openshift-install` binary with Cluster API bundled:

pkg/asset/machines/clusterapi.go

@@ -19,7 +19,9 @@ import (
 	"github.com/openshift/installer/pkg/asset/machines/aws"
 	"github.com/openshift/installer/pkg/asset/manifests/capiutils"
 	"github.com/openshift/installer/pkg/asset/rhcos"
+	awstypes "github.com/openshift/installer/pkg/types/aws"
 	awsdefaults "github.com/openshift/installer/pkg/types/aws/defaults"
+	azuretypes "github.com/openshift/installer/pkg/types/azure"
 )
 
 // GenerateClusterAPI generates manifests for target cluster.
@@ -30,7 +32,7 @@ func GenerateClusterAPI(ctx context.Context, installConfig *installconfig.Instal
 	pool := *ic.ControlPlane
 
 	switch ic.Platform.Name() {
-	case "aws":
+	case awstypes.Name:
 		subnets := map[string]string{}
 		if len(ic.Platform.AWS.Subnets) > 0 {
 			subnetMeta, err := installConfig.AWS.PrivateSubnets(ctx)
@@ -169,7 +171,8 @@ func GenerateClusterAPI(ctx context.Context, installConfig *installconfig.Instal
 			File:   asset.File{Filename: fmt.Sprintf("10_machine_%s.yaml", bootstrapMachine.Name)},
 			Object: bootstrapMachine,
 		})
-	case "azure":
+	case azuretypes.Name:
+		// TODO: implement
 	default:
 		// TODO: support other platforms
 	}

pkg/asset/manifests/clusterapi/cluster.go

@@ -26,6 +26,8 @@ import (
 	"github.com/openshift/installer/pkg/asset/openshiftinstall"
 	"github.com/openshift/installer/pkg/asset/rhcos"
 	"github.com/openshift/installer/pkg/clusterapi"
+	awstypes "github.com/openshift/installer/pkg/types/aws"
+	azuretypes "github.com/openshift/installer/pkg/types/azure"
 )
 
 const (
@@ -142,7 +144,7 @@ func (c *Cluster) Generate(dependencies asset.Parents) error {
 
 	var out *capiutils.GenerateClusterAssetsOutput
 	switch platform := installConfig.Config.Platform.Name(); platform {
-	case "aws":
+	case awstypes.Name:
 		// Move this somewhere else.
 		// if err := aws.PutIAMRoles(clusterID.InfraID, installConfig); err != nil {
 		// 	return errors.Wrap(err, "failed to create IAM roles")
@@ -152,11 +154,11 @@ func (c *Cluster) Generate(dependencies asset.Parents) error {
 		if err != nil {
 			return errors.Wrap(err, "failed to generate AWS manifests")
 		}
-	case "azure":
+	case azuretypes.Name:
 		var err error
 		out, err = azure.GenerateClusterAssets(installConfig, clusterID)
 		if err != nil {
-			return errors.Wrap(err, "failed to generate AWS manifests")
+			return errors.Wrap(err, "failed to generate Azure manifests")
 		}
 	default:
 		return fmt.Errorf("unsupported platform %q", platform)

pkg/clusterapi/system.go

@@ -278,6 +278,8 @@ func (c *system) getInfrastructureController(provider *Provider, args []string,
 	defaultManifestPath := filepath.Join(c.componentDir, fmt.Sprintf("/%s-infrastructure-components.yaml", provider.Name))
 	if _, err := os.Stat(defaultManifestPath); err == nil {
 		manifests = append(manifests, defaultManifestPath)
+	} else {
+		logrus.Infof("Failed to find manifests for provider %s at %s", provider.Name, defaultManifestPath)
 	}
 	return &controller{
 		Provider:   provider,