[WIP] frontend: Generate YAML cluster config instead of tfvars file by kyoto · Pull Request #2884 · coreos/tectonic-installer

kyoto · 2018-02-02T09:29:56Z

Change cluster-config.js to output the new Tectonic cluster config values and change the backend to write out a YAML config file instead of a tfvars file.

Update GUI unit tests and end-to-end tests to test the YAML config. Adds js-yaml as a dev dependency for the end-to-end tests.

cc @alexsomesan @spangenberg

coreosbot · 2018-02-02T09:29:58Z

Can one of the admins verify this patch?

kyoto · 2018-02-06T10:50:26Z

ok to test

* CLI MVP * Kingpin bazel build * Bazel: per-arch targets and top-level alias

* Re-add missing Bazel file for CLI package * Missing EOL on last line

* installer/pkg: Add cluster config generator This enables to generate the cluster configuration from an abstract configuration which describes multiple tectonic clusters. Not all configuration options have been mapped so far, this is work in progress. * installer/pkg: Add terraform config generator This enables to generate the terraform configuration from an abstract configuration which describes multiple tectonic clusters. Not all configuration options have been mapped so far, this is work in progress. * installker/pkg: Parse and generate platform specific properties * installer: Update dependencies * installer/pkg/config-generator: Remove initial core config * installer: Fix and generate bazel build files

platform/aws: move assets generation into own tf step

* platform/aws: add ncg ignition for workers * platform/aws: add ncg ignition for masters * platform/aws: add ignition for bootstrap master * platform/aws: remove leader election code * platform/aws: add ignition for etcd * platform/aws: add support for the NCG * terraform fmt

* add multistep support for the cli * cli: Fix lint

Reconcile

0. Build tarball and smoke tests in previous Jenkins stage 1. Unzip the release tarball 2. Setup build folder and $PATH 3. Make rspec use release folder instead of git repository

tests: Cherry-pick coreos#2907

remove bootstrap ignition as part of rm-assets

fix mixed vars

squat · 2018-02-19T11:28:31Z

installer/api/handlers_terraform.go

+	PullSecret  string                `json:"pullSecret"`
+	Retry       bool                  `json:"retry"`
+	Variables   struct {
+		AWS              map[string]interface{} `json:"AWS,omitempty"`


by convention, JSON is encoded in camel-case. Why is this using title casing?

Like you said in your other comment, I'm just matching the existing JSON keys. I agree that they should be changed to camelCase though.

Ok thanks for confirming. We’ll need to follow up and fix this on the config-generator side of things

squat · 2018-02-19T11:30:00Z

installer/pkg/terraform/executor_test.go

 		assert.FailNow(t, "TerraForm apply timed out")
 	}

+	// TODO: Update tests for new CLI


rather that comment these out, can you skip the tests so that their lack of implementation is noted in the test output? See https://golang.org/pkg/testing/#T.Skip

squat · 2018-02-19T11:32:11Z

Overall LGTM. needs rebase. I'm a little confused about the marshaling of json but if you're just keeping up with @spangenberg 's changes, then that shouldn't block this PR. We will need to fix json marshalling in his code generation

cli: populate core config

Also stop passing FORMS to config generator functions.

Adds js-yaml as a dev dependency.

kyoto · 2018-02-21T02:10:47Z

ok to test

kyoto · 2018-02-22T02:17:21Z

We will wait to merge this until after ut2-integration has merged into master.

squat · 2018-02-28T18:03:03Z

we'll need to re-open this against master now that ut2 has merged.

coreosbot · 2018-03-01T01:44:21Z

Can one of the admins verify this patch?

kyoto added the run-gui-tests label Feb 2, 2018

kyoto force-pushed the output-tectonic-config branch from f30027d to 5743f30 Compare February 2, 2018 13:21

kyoto added the do-not-merge label Feb 2, 2018

kyoto changed the base branch from master to ut2-integration February 6, 2018 06:58

kyoto force-pushed the output-tectonic-config branch from 5743f30 to d236504 Compare February 6, 2018 08:28

kyoto changed the title ~~[WIP] frontend: Generate YAML cluster config instead of tfvars file~~ frontend: Generate YAML cluster config instead of tfvars file Feb 6, 2018

kyoto removed the do-not-merge label Feb 6, 2018

kyoto requested a review from squat February 6, 2018 11:22

alexsomesan added 2 commits February 6, 2018 18:29

Cli tool (coreos#2806)

417b10b

* CLI MVP * Kingpin bazel build * Bazel: per-arch targets and top-level alias

Fix bazel build for CLI (coreos#2897)

67c070d

* Re-add missing Bazel file for CLI package * Missing EOL on last line

enxebre force-pushed the ut2-integration branch from 1ed8587 to 67c070d Compare February 6, 2018 17:36

enxebre and others added 17 commits February 6, 2018 19:33

platform/aws: move assets generation into own tf step

b7921cc

Merge pull request coreos#2905 from enxebre/assets

4c287ce

platform/aws: move assets generation into own tf step

installer/pkg: Integrate config generator into CLI (coreos#2936)

0936b1d

platform/aws: add bootstrap node and step for joining it (coreos#2924)

7c45aec

platform/aws: create bootstrap step (coreos#2946)

a2c05a1

add multistep support for the cli - WIP - DO NOT MERGE (coreos#2949)

6c7ffed

* add multistep support for the cli * cli: Fix lint

remove bootstrap ignition as part of rm-assets

06cec44

merge master into ut2 and fix conflicts

dbf6eff

reconcile with master kube tls changes

d9b10d0

update bazel for steps and cli

8da735e

update Bazel cli target

d7f6ea1

add cli to tarball target

9392c75

fix bazel golang deps

19bf4f9

Merge pull request coreos#2953 from enxebre/reconcile

e572028

Reconcile

tests: Run rspec tests out of bazel build output

8f7faaf

0. Build tarball and smoke tests in previous Jenkins stage 1. Unzip the release tarball 2. Setup build folder and $PATH 3. Make rspec use release folder instead of git repository

mxinden and others added 6 commits February 16, 2018 14:22

Merge pull request coreos#2967 from mxinden/ut2-bazel-rspec

baad1c5

tests: Cherry-pick coreos#2907

Merge pull request coreos#2958 from enxebre/rm-ignition

1fde22a

remove bootstrap ignition as part of rm-assets

installer: Integrate multistep cli with configuration (coreos#2960)

7f7e7b8

fix mixed vars

1aabedb

Merge pull request coreos#2970 from enxebre/fix-mixed-var

bfa7b4c

fix mixed vars

cli: populate core config

e8f566e

squat reviewed Feb 19, 2018

View reviewed changes

Merge pull request coreos#2982 from enxebre/core-config

03654fc

cli: populate core config

kyoto force-pushed the output-tectonic-config branch from d236504 to 47874f8 Compare February 20, 2018 01:22

kyoto added 3 commits February 20, 2018 16:00

frontend: Generate YAML cluster config instead of tfvars file

c193c0a

Also stop passing FORMS to config generator functions.

tests/frontend: Update GUI Nightwatch tests to diff new YAML config file

f8e9a2f

Adds js-yaml as a dev dependency.

test/api: Skip some tests that will need changing for the new CLI

bceb797

kyoto force-pushed the output-tectonic-config branch from 47874f8 to bceb797 Compare February 20, 2018 07:01

kyoto added the do-not-merge label Feb 22, 2018

kyoto changed the title ~~frontend: Generate YAML cluster config instead of tfvars file~~ [WIP] frontend: Generate YAML cluster config instead of tfvars file Feb 22, 2018

trawler force-pushed the ut2-integration branch from 2358733 to 3fdc67a Compare February 26, 2018 16:01

mxinden force-pushed the ut2-integration branch from 311faeb to f6b626e Compare February 27, 2018 17:49

squat closed this Feb 28, 2018

kyoto changed the base branch from ut2-integration to master March 1, 2018 01:44

kyoto mentioned this pull request Mar 6, 2018

frontend: Remove GUI for Track 2 #3067

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] frontend: Generate YAML cluster config instead of tfvars file#2884

[WIP] frontend: Generate YAML cluster config instead of tfvars file#2884
kyoto wants to merge 29 commits intocoreos:masterfrom
kyoto:output-tectonic-config

kyoto commented Feb 2, 2018 •

edited

Loading

Uh oh!

coreosbot commented Feb 2, 2018

Uh oh!

kyoto commented Feb 6, 2018

Uh oh!

squat Feb 19, 2018

Uh oh!

kyoto Feb 20, 2018

Uh oh!

squat Feb 20, 2018

Uh oh!

squat Feb 19, 2018 •

edited

Loading

Uh oh!

kyoto Feb 20, 2018

Uh oh!

squat commented Feb 19, 2018

Uh oh!

kyoto commented Feb 21, 2018

Uh oh!

kyoto commented Feb 22, 2018

Uh oh!

squat commented Feb 28, 2018

Uh oh!

coreosbot commented Mar 1, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

kyoto commented Feb 2, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coreosbot commented Feb 2, 2018

Uh oh!

kyoto commented Feb 6, 2018

Uh oh!

squat Feb 19, 2018

Choose a reason for hiding this comment

Uh oh!

kyoto Feb 20, 2018

Choose a reason for hiding this comment

Uh oh!

squat Feb 20, 2018

Choose a reason for hiding this comment

Uh oh!

squat Feb 19, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kyoto Feb 20, 2018

Choose a reason for hiding this comment

Uh oh!

squat commented Feb 19, 2018

Uh oh!

kyoto commented Feb 21, 2018

Uh oh!

kyoto commented Feb 22, 2018

Uh oh!

squat commented Feb 28, 2018

Uh oh!

coreosbot commented Mar 1, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

kyoto commented Feb 2, 2018 •

edited

Loading

squat Feb 19, 2018 •

edited

Loading