Working vsphere clusterctl example #263

jessicaochen · 2018-05-31T20:21:26Z

Add the v0 vsphere configuration examples.

Pod specs are up to date as of commit cf9bcf6 (#219)

Special notes for your reviewer:

Release note:

@kubernetes/kube-deploy-reviewers

k8s-ci-robot · 2018-05-31T20:21:32Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jessicaochen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [jessicaochen]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

jessicaochen · 2018-05-31T20:21:49Z

/assign @k4leung4 @mkjelland

k4leung4 · 2018-05-31T20:39:31Z

clusterctl/examples/vsphere/README.md

@@ -0,0 +1,22 @@
+# Vsphere Example Files
+## Contents
+*.yaml files - concrete example files that can be used as is.


did you want this in a list? this and the next line shows up together
might help to check out how the md file is parsed [View] button

k4leung4 · 2018-05-31T20:41:47Z

clusterctl/examples/vsphere/README.md

+## Generation
+For convenience, a generation script which populates templates where possible.
+
+1. Run the generation script.


can you mention which files are generated by the generation script

mkjelland · 2018-05-31T21:57:39Z

clusterctl/cmd/create_cluster.go

+// Adapt the terraform methods calls since gcp/terraform are not on the same page.
+// Long term, these providers should converge or the need for a provider will go away.
+// Whichever comes first.
+type terraformAdapter struct {


I was just thinking about this. Now that all providers are using the same tool it's more important for the current providers to be in sync. The machine.Actuator already forces them to be somewhat in sync, do you think we need something similar the GetIP and GetKubeConfig methods?

The clusterdeployer.ProviderDeployer can do that in the future. We could get vsphere caught up with gcp and then remove this adapter. I do want to do such work not in this PR though.

mkjelland · 2018-05-31T22:13:19Z

clusterctl/examples/vsphere/generate-yaml.sh

+PROVIDERCOMPONENT_GENERATED_FILE=provider-components.yaml
+
+MACHINE_CONTROLLER_SSH_PUBLIC_FILE=vsphere_tmp.pub
+MACHINE_CONTROLLER_SSH_PUBLIC=


Is this supposed to be empty?

Yep. It is the contents of the file. Will be populated after generation.

mkjelland · 2018-05-31T22:16:35Z

clusterctl/examples/vsphere/generate-yaml.sh

+while test $# -gt 0; do
+        case "$1" in
+          -h|--help)
+            echo "$SCRIPT - generates input yaml files for Cluster API on Google Cloud Platform"


Replace Google Cloud Platform with vSphere

mkjelland · 2018-05-31T22:30:10Z

clusterctl/cmd/create_cluster.go

@@ -144,9 +144,27 @@ func getProvider(provider string) (clusterdeployer.ProviderDeployer, error) {
 	case "google":
 		return google.NewMachineActuator(google.MachineActuatorParams{})
 	case "terraform":


Do you plan to have a separate option for the vsphere provider, or do you think this will eventually be replaced by that one? #233

I swapped for vsphere one. We can add terraform back should we having a case for that.

k4leung4 · 2018-06-01T15:12:43Z

clusterctl/cmd/create_cluster.go

 	default:
 		return nil, fmt.Errorf("Unrecognized provider %v", provider)
 	}
 }
+
+// Adapt the terraform methods calls since gcp/vsphere are not on the same page.


should it be vsphere methods instead of terraform methods?

k4leung4 · 2018-06-01T15:14:51Z

clusterctl/examples/vsphere/machines.yaml.template

+          "virtual_machine_domain = \"\"",
+				]
+    versions:
+      kubelet: 1.9.7


is it intentional to have the master run at 1.10.1 while the nodes run at 1.9.7
if so, a comment would be nice.

k4leung4 · 2018-06-01T15:15:30Z

clusterctl/examples/vsphere/machines.yaml.template

+- apiVersion: "cluster.k8s.io/v1alpha1"
+  kind: Machine
+  metadata:
+    generateName: jesschen-tf-test-


did you want to keep your username in the example?
its ok if you did, just checking

k4leung4 · 2018-06-01T15:16:01Z

clusterctl/examples/vsphere/provider-components.yaml.template

+          limits:
+            cpu: 100m
+            memory: 30Mi
+      - name: terraform-machine-controller


should this be renamed the vsphere-machine-controller?

k4leung4 · 2018-06-01T15:16:24Z

clusterctl/examples/vsphere/provider-components.yaml.template

+            cpu: 100m
+            memory: 30Mi
+      - name: terraform-machine-controller
+        image: gcr.io/k8s-cluster-api/terraform-machine-controller:0.0.6


the image should point to the vsphere image since you are using the vsphere provider now.

mkjelland · 2018-06-01T15:16:42Z

clusterctl/examples/vsphere/machines.yaml.template

@@ -0,0 +1,62 @@
+items:


Now that you are using the vsphere client, this may need to updated based on PR #257. The apiVersion will be vsphereproviderconfig and the kind is either VsphereClusterProviderConfig or VsphereMachineProviderConfig. The username/password/server fields moved from the machine to the cluster providerConfig.

wangzhen127 · 2018-06-01T20:49:02Z

clusterctl/cmd/create_cluster.go

@@ -95,7 +95,7 @@ func init() {
 	createClusterCmd.Flags().StringVarP(&co.Machine, "machines", "m", "", "A yaml file containing machine object definition(s)")
 	createClusterCmd.Flags().StringVarP(&co.ProviderComponents, "provider-components", "p", "", "A yaml file containing cluster api provider controllers and supporting objects")
 	// TODO: Remove as soon as code allows https://github.com/kubernetes-sigs/cluster-api/issues/157
-	createClusterCmd.Flags().StringVarP(&co.Provider, "provider", "", "", "Which provider deployment logic to use (google/terraform)")
+	createClusterCmd.Flags().StringVarP(&co.Provider, "provider", "", "", "Which provider deployment logic to use (google/vsphere)")


Can we mark the required flags using things like:
createClusterCmd.MarkFlagRequired("provider")

I think that is a good idea for a different PR.

jessicaochen · 2018-06-01T21:01:14Z

Incorporated #257, #264 . Bumped image so #264 logic available.

mkjelland

lgtm, leaving for @k4leung4 to add lgtm label

k4leung4 · 2018-06-01T22:13:05Z

/lgtm

…n-certs 🐛 Separate certificate logic for joins

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 31, 2018

k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 31, 2018

k8s-ci-robot assigned k4leung4 and mkjelland May 31, 2018

k4leung4 reviewed May 31, 2018

View reviewed changes

mkjelland reviewed May 31, 2018

View reviewed changes

jessicaochen force-pushed the cluster_create_e2e_vsphere branch from a9b57b6 to a0f1302 Compare June 1, 2018 00:04

This was referenced Jun 1, 2018

Move tf-state to machine object, and remove file system dependency #264

Merged

[vSphere] Move terraform state to machine object, instead of file system #224

Closed

k4leung4 reviewed Jun 1, 2018

View reviewed changes

mkjelland reviewed Jun 1, 2018

View reviewed changes

wangzhen127 reviewed Jun 1, 2018

View reviewed changes

Working vsphere clusterctl example

c82c5a7

jessicaochen force-pushed the cluster_create_e2e_vsphere branch from a0f1302 to c82c5a7 Compare June 1, 2018 20:58

mkjelland approved these changes Jun 1, 2018

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 1, 2018

k8s-ci-robot merged commit 6ef7148 into kubernetes-sigs:master Jun 1, 2018

chuckha pushed a commit to chuckha/cluster-api that referenced this pull request Oct 2, 2019

Merge pull request kubernetes-sigs#263 from chuckha/control-plane-joi…

b22e54b

…n-certs 🐛 Separate certificate logic for joins

jayunit100 pushed a commit to jayunit100/cluster-api that referenced this pull request Jan 31, 2020

Working vsphere clusterctl example (kubernetes-sigs#263)

e6f34c9

jayunit100 pushed a commit to jayunit100/cluster-api that referenced this pull request Jan 31, 2020

Working vsphere clusterctl example (kubernetes-sigs#263)

20059b2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Working vsphere clusterctl example #263

Working vsphere clusterctl example #263

jessicaochen commented May 31, 2018

k8s-ci-robot commented May 31, 2018

jessicaochen commented May 31, 2018

k4leung4 May 31, 2018

jessicaochen Jun 1, 2018

k4leung4 May 31, 2018

jessicaochen Jun 1, 2018

mkjelland May 31, 2018

jessicaochen Jun 1, 2018

mkjelland May 31, 2018

jessicaochen Jun 1, 2018

mkjelland May 31, 2018

jessicaochen Jun 1, 2018

mkjelland May 31, 2018

jessicaochen Jun 1, 2018

k4leung4 Jun 1, 2018

jessicaochen Jun 1, 2018

k4leung4 Jun 1, 2018

jessicaochen Jun 1, 2018

k4leung4 Jun 1, 2018

jessicaochen Jun 1, 2018

k4leung4 Jun 1, 2018

jessicaochen Jun 1, 2018

k4leung4 Jun 1, 2018

jessicaochen Jun 1, 2018

mkjelland Jun 1, 2018

jessicaochen Jun 1, 2018

wangzhen127 Jun 1, 2018

jessicaochen Jun 1, 2018

jessicaochen commented Jun 1, 2018

mkjelland left a comment

k4leung4 commented Jun 1, 2018

Working vsphere clusterctl example #263

Working vsphere clusterctl example #263

Conversation

jessicaochen commented May 31, 2018

k8s-ci-robot commented May 31, 2018

jessicaochen commented May 31, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jessicaochen commented Jun 1, 2018

mkjelland left a comment

Choose a reason for hiding this comment

k4leung4 commented Jun 1, 2018