Add OpenStack provider

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
 
 ## [Unreleased]
 
+### Added
+
+- Alpha support for vSphere and OpenStack providers.
+
 ### Changed
 
 - Usa CAPI templates for all releases from `v20.0.0-alpha1` onwards, to include alpha and beta releases.

cmd/get/capi/runner.go

@@ -19,10 +19,11 @@ import (
 const (
 	giantswarmNamespace = "giantswarm"
 
-	providerAll    = "All"
-	providerAWS    = "AWS"
-	providerAzure  = "Azure"
-	providerVMware = "VMware"
+	providerAll       = "All"
+	providerAWS       = "AWS"
+	providerAzure     = "Azure"
+	providerOpenStack = "OpenStack"
+	providerVSphere   = "vSphere"
 )
 
 type runner struct {
@@ -47,6 +48,7 @@ type controller struct {
 
 var (
 	crds = []crd{
+		// All
 		{
 			DisplayName: "Cluster",
 			Name:        "clusters.cluster.x-k8s.io",
@@ -102,6 +104,7 @@ var (
 			Name:        "kubeadmconfigtemplates.bootstrap.cluster.x-k8s.io",
 			Provider:    providerAll,
 		},
+		// AWS
 		{
 			DisplayName: "AWS Cluster",
 			Name:        "awsclusters.infrastructure.cluster.x-k8s.io",
@@ -122,6 +125,7 @@ var (
 			Name:        "awsmachinetemplates.infrastructure.cluster.x-k8s.io",
 			Provider:    providerAWS,
 		},
+		// Azure
 		{
 			DisplayName: "Azure Cluster",
 			Name:        "azureclusters.infrastructure.cluster.x-k8s.io",
@@ -142,30 +146,47 @@ var (
 			Name:        "azuremachinetemplates.infrastructure.cluster.x-k8s.io",
 			Provider:    providerAzure,
 		},
+		// Open Stack
 		{
-			DisplayName: "VMware Cluster",
+			DisplayName: "OpenStack Cluster",
 			Name:        "vsphereclusters.infrastructure.cluster.x-k8s.io",
-			Provider:    providerVMware,
+			Provider:    providerOpenStack,
 		},
 		{
-			DisplayName: "VMware Machine",
+			DisplayName: "OpenStack Machine",
 			Name:        "vspheremachines.infrastructure.cluster.x-k8s.io",
-			Provider:    providerVMware,
+			Provider:    providerOpenStack,
 		},
 		{
-			DisplayName: "VMware Machine Template",
+			DisplayName: "OpenStack Machine Template",
 			Name:        "vspheremachinetemplates.infrastructure.cluster.x-k8s.io",
-			Provider:    providerVMware,
+			Provider:    providerOpenStack,
 		},
+		// vSphere
 		{
-			DisplayName: "VMware VM",
+			DisplayName: "vSphere Cluster",
+			Name:        "vsphereclusters.infrastructure.cluster.x-k8s.io",
+			Provider:    providerVSphere,
+		},
+		{
+			DisplayName: "vSphere Machine",
+			Name:        "vspheremachines.infrastructure.cluster.x-k8s.io",
+			Provider:    providerVSphere,
+		},
+		{
+			DisplayName: "vSphere Machine Template",
+			Name:        "vspheremachinetemplates.infrastructure.cluster.x-k8s.io",
+			Provider:    providerVSphere,
+		},
+		{
+			DisplayName: "vSphere VM",
 			Name:        "vspherevms.infrastructure.cluster.x-k8s.io",
-			Provider:    providerVMware,
+			Provider:    providerVSphere,
 		},
 		{
-			DisplayName: "VMware HAProxy",
+			DisplayName: "vSphere HAProxy",
 			Name:        "haproxyloadbalancers.infrastructure.cluster.x-k8s.io",
-			Provider:    providerVMware,
+			Provider:    providerVSphere,
 		},
 	}
 
@@ -201,10 +222,16 @@ var (
 			Provider:      providerAzure,
 		},
 		{
-			DisplayName:   "VMWare Provider",
-			LabelSelector: "app.kubernetes.io/name=cluster-api-provider-vmware",
+			DisplayName:   "OpenStack Provider",
+			LabelSelector: "app.kubernetes.io/name=cluster-api-provider-openstack",
+			ContainerName: "manager",
+			Provider:      providerOpenStack,
+		},
+		{
+			DisplayName:   "vSphere Provider",
+			LabelSelector: "app.kubernetes.io/name=cluster-api-provider-vsphere",
 			ContainerName: "manager",
-			Provider:      providerVMware,
+			Provider:      providerVSphere,
 		},
 	}
 )

cmd/template/cluster/flag.go

@@ -124,6 +124,7 @@ func (f *flag) Validate() error {
 	validProviders := []string{
 		key.ProviderAWS,
 		key.ProviderAzure,
+		key.ProviderOpenStack,
 		key.ProviderVsphere,
 	}
 	isValidProvider := false

cmd/template/cluster/provider/capo.go

@@ -0,0 +1,60 @@
+package provider
+
+import (
+	"bytes"
+	"context"
+	"io"
+	"os"
+	"path/filepath"
+
+	"github.com/giantswarm/k8sclient/v5/pkg/k8sclient"
+	"github.com/giantswarm/microerror"
+
+	"github.com/giantswarm/kubectl-gs/cmd/template/cluster/provider/templates/openstack"
+	"github.com/giantswarm/kubectl-gs/internal/key"
+)
+
+func WriteCAPOTemplate(ctx context.Context, client k8sclient.Interface, out io.Writer, config ClusterCRsConfig) error {
+	var err error
+
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return microerror.Mask(err)
+	}
+
+	idRsaPubBytes, err := os.ReadFile(filepath.Join(homeDir, ".ssh/id_rsa.pub"))
+	if err != nil {
+		return microerror.Mask(err)
+	}
+	idRsaPubBytes = bytes.TrimSpace(idRsaPubBytes)
+
+	data := struct {
+		Description       string
+		KubernetesVersion string
+		Name              string
+		Namespace         string
+		Organization      string
+		ReleaseVersion    string
+		SSHPublicKey      string
+	}{
+		Description:       config.Description,
+		KubernetesVersion: "v1.20.1",
+		Name:              config.Name,
+		Namespace:         key.OrganizationNamespaceFromName(config.Organization),
+		Organization:      config.Organization,
+		ReleaseVersion:    config.ReleaseVersion,
+		SSHPublicKey:      string(idRsaPubBytes),
+	}
+
+	var templates []templateConfig
+	for _, t := range openstack.GetTemplates() {
+		templates = append(templates, templateConfig(t))
+	}
+
+	err = runMutation(ctx, client, data, templates, out)
+	if err != nil {
+		return microerror.Mask(err)
+	}
+
+	return nil
+}

cmd/template/cluster/provider/templates/openstack/cluster.yaml.tmpl

@@ -0,0 +1,28 @@
+apiVersion: cluster.x-k8s.io/v1alpha4
+kind: Cluster
+metadata:
+  annotations:
+    cluster.giantswarm.io/description: {{ .Description }}
+  labels:
+    release.giantswarm.io/version: {{ .ReleaseVersion }}
+    giantswarm.io/cluster: {{ .Name }}
+    cluster.x-k8s.io/cluster-name: {{ .Name }}
+    giantswarm.io/organization: {{ .Organization }}
+  name: {{ .Name }}
+  namespace: {{ .Namespace }}
+spec:
+  clusterNetwork:
+    pods:
+      cidrBlocks:
+      - 192.168.0.0/16
+  controlPlaneEndpoint:
+    host: 10.0.6.191
+    port: 6443
+  controlPlaneRef:
+    apiVersion: controlplane.cluster.x-k8s.io/v1alpha4
+    kind: KubeadmControlPlane
+    name: {{ .Name }}
+  infrastructureRef:
+    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
+    kind: OpenStackCluster
+    name: {{ .Name }}

cmd/template/cluster/provider/templates/openstack/kubeadm_config_template.yaml.tmpl

@@ -0,0 +1,31 @@
+apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
+kind: KubeadmConfigTemplate
+metadata:
+  metadata:
+  labels:
+    cluster.x-k8s.io/cluster-name: {{ .Name }}
+    giantswarm.io/cluster: {{ .Name }}
+    giantswarm.io/organization: {{ .Organization }}
+    release.giantswarm.io/version: {{ .ReleaseVersion }}
+  name: {{ .Name }}-md-0
+  namespace: {{ .Namespace }}
+spec:
+  template:
+    spec:
+      joinConfiguration:
+        nodeRegistration:
+          criSocket: /var/run/containerd/containerd.sock
+          kubeletExtraArgs:
+            cloud-provider: external
+          name: '{{ `{{ ds.meta_data.hostname }}` }}'
+      preKubeadmCommands:
+      - hostname "{{ `{{ ds.meta_data.hostname }}` }}"
+      - echo "::1         ipv6-localhost ipv6-loopback" >/etc/hosts
+      - echo "127.0.0.1   localhost" >>/etc/hosts
+      - echo "127.0.0.1   {{ `{{ ds.meta_data.hostname }}` }}" >>/etc/hosts
+      - echo "{{ `{{ ds.meta_data.hostname }}` }}" >/etc/hostname
+      users:
+      - name: capo
+        sshAuthorizedKeys:
+        - "{{ .SSHPublicKey }}"
+        sudo: ALL=(ALL) NOPASSWD:ALL

cmd/template/cluster/provider/templates/openstack/kubeadm_control_plane.yaml.tmpl

@@ -0,0 +1,50 @@
+apiVersion: controlplane.cluster.x-k8s.io/v1alpha4
+kind: KubeadmControlPlane
+metadata:
+  labels:
+    "release.giantswarm.io/version": "{{ .ReleaseVersion }}"
+    "giantswarm.io/cluster": "{{ .Name }}"
+    "cluster.x-k8s.io/cluster-name": "{{ .Name }}"
+    "giantswarm.io/organization": "{{ .Organization }}"
+  name: {{ .Name }}
+  namespace: {{ .Namespace }}
+spec:
+  kubeadmConfigSpec:
+    clusterConfiguration:
+      apiServer:
+        extraArgs:
+          cloud-provider: external
+      controllerManager:
+        extraArgs:
+          cloud-provider: external
+    initConfiguration:
+      nodeRegistration:
+        criSocket: /var/run/containerd/containerd.sock
+        kubeletExtraArgs:
+          cloud-provider: external
+        name: '{{ `{{ ds.meta_data.hostname }}` }}'
+    joinConfiguration:
+      nodeRegistration:
+        criSocket: /var/run/containerd/containerd.sock
+        kubeletExtraArgs:
+          cloud-provider: external
+        name: '{{ `{{ ds.meta_data.hostname }}` }}'
+    preKubeadmCommands:
+    - hostname "{{ `{{ ds.meta_data.hostname }}` }}"
+    - echo "::1         ipv6-localhost ipv6-loopback" >/etc/hosts
+    - echo "127.0.0.1   localhost" >>/etc/hosts
+    - echo "127.0.0.1   {{ `{{ ds.meta_data.hostname }}` }}" >>/etc/hosts
+    - echo "{{ `{{ ds.meta_data.hostname }}` }}" >/etc/hostname
+    useExperimentalRetryJoin: true
+    users:
+    - name: capo
+      sshAuthorizedKeys:
+      - "{{ .SSHPublicKey }}"
+      sudo: ALL=(ALL) NOPASSWD:ALL
+  machineTemplate:
+    infrastructureRef:
+      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
+      kind: OpenStackMachineTemplate
+      name: {{ .Name }}
+  replicas: 1
+  version: {{ .KubernetesVersion }}

cmd/template/cluster/provider/templates/openstack/machine_deployment.yaml.tmpl

@@ -0,0 +1,40 @@
+apiVersion: cluster.x-k8s.io/v1alpha4
+kind: MachineDeployment
+metadata:
+  metadata:
+  labels:
+    cluster.x-k8s.io/cluster-name: {{ .Name }}
+    cluster.x-k8s.io/watch-filter: capi
+    giantswarm.io/cluster: {{ .Name }}
+    giantswarm.io/organization: {{ .Organization }}
+    release.giantswarm.io/version: {{ .ReleaseVersion }}
+  name: {{ .Name }}-md
+  namespace: {{ .Namespace }}
+spec:
+  clusterName: {{ .Name }}
+  minReadySeconds: 0
+  progressDeadlineSeconds: 600
+  replicas: 3
+  revisionHistoryLimit: 1
+  selector:
+    matchLabels:
+      cluster.x-k8s.io/cluster-name: {{ .Name }}
+      cluster.x-k8s.io/deployment-name: {{ .Name }}-md-0
+  template:
+    metadata:
+      labels:
+        cluster.x-k8s.io/cluster-name: {{ .Name }}
+        cluster.x-k8s.io/deployment-name: {{ .Name }}-md-0
+    spec:
+      bootstrap:
+        configRef:
+          apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
+          kind: KubeadmConfigTemplate
+          name: {{ .Name }}-md-0
+      clusterName: {{ .Name }}
+      failureDomain: changeme
+      infrastructureRef:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
+        kind: OpenStackMachineTemplate
+        name: {{ .Name }}
+      version: {{ .KubernetesVersion }}

cmd/template/cluster/provider/templates/openstack/open_stack_cluster.yaml.tmpl

@@ -0,0 +1,21 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
+kind: OpenStackCluster
+metadata:
+  labels:
+    "release.giantswarm.io/version": "{{ .ReleaseVersion }}"
+    "giantswarm.io/cluster": "{{ .Name }}"
+    "cluster.x-k8s.io/cluster-name": "{{ .Name }}"
+    "giantswarm.io/organization": "{{ .Organization }}"
+  name: {{ .Name }}
+  namespace: {{ .Namespace }}
+spec:
+  cloudName: changeme
+  identityRef:
+    name: changeme
+    kind: Secret
+  managedAPIServerLoadBalancer: true
+  managedSecurityGroups: true
+  nodeCidr: 10.6.0.0/24
+  dnsNameservers:
+  - changeme
+  externalNetworkId: changeme

cmd/template/cluster/provider/templates/openstack/open_stack_machine_template.yaml.tmpl

@@ -0,0 +1,20 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
+kind: OpenStackMachineTemplate
+metadata:
+  labels:
+    "release.giantswarm.io/version": "{{ .ReleaseVersion }}"
+    "giantswarm.io/cluster": "{{ .Name }}"
+    "cluster.x-k8s.io/cluster-name": "{{ .Name }}"
+    "giantswarm.io/organization": "{{ .Organization }}"
+  name: {{ .Name }}
+  namespace: {{ .Namespace }}
+spec:
+  template:
+    spec:
+      flavor: changeme
+      image: changeme
+      sshKeyName: changeme
+      cloudName: changeme
+      identityRef:
+        name: changeme
+        kind: Secret