Refactored airshipctl config

Removed Modules from config. There are no other types of modules
that need additional configuration. BootstrapInfo is defined
in the config directly.

Used camelCase for config parameters.

Change-Id: I3531a061026f3b2f1e72af6272ba4709f28d1b3d
This commit is contained in:
Stanislav Egorov
2020-04-20 16:27:59 -07:00
parent 68c97923e1
commit cd9b4dddb4
29 changed files with 247 additions and 299 deletions

View File

@@ -1,7 +1,7 @@
Cluster: clusterBar
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterBar_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterBar_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -9,8 +9,8 @@ server: ""
Cluster: clusterBar
target:
bootstrap-info: ""
cluster-kubeconf: clusterBar_target
bootstrapInfo: ""
clusterKubeconf: clusterBar_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -18,8 +18,8 @@ server: ""
Cluster: clusterBaz
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterBaz_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterBaz_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -27,8 +27,8 @@ server: ""
Cluster: clusterBaz
target:
bootstrap-info: ""
cluster-kubeconf: clusterBaz_target
bootstrapInfo: ""
clusterKubeconf: clusterBaz_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -36,8 +36,8 @@ server: ""
Cluster: clusterFoo
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterFoo_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterFoo_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -45,8 +45,8 @@ server: ""
Cluster: clusterFoo
target:
bootstrap-info: ""
cluster-kubeconf: clusterFoo_target
bootstrapInfo: ""
clusterKubeconf: clusterFoo_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true

View File

@@ -1,7 +1,7 @@
Cluster: clusterBar
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterBar_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterBar_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -9,8 +9,8 @@ server: ""
Cluster: clusterBar
target:
bootstrap-info: ""
cluster-kubeconf: clusterBar_target
bootstrapInfo: ""
clusterKubeconf: clusterBar_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -18,8 +18,8 @@ server: ""
Cluster: clusterBaz
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterBaz_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterBaz_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -27,8 +27,8 @@ server: ""
Cluster: clusterBaz
target:
bootstrap-info: ""
cluster-kubeconf: clusterBaz_target
bootstrapInfo: ""
clusterKubeconf: clusterBaz_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -36,8 +36,8 @@ server: ""
Cluster: clusterFoo
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterFoo_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterFoo_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -45,8 +45,8 @@ server: ""
Cluster: clusterFoo
target:
bootstrap-info: ""
cluster-kubeconf: clusterFoo_target
bootstrapInfo: ""
clusterKubeconf: clusterFoo_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true

View File

@@ -1,7 +1,7 @@
Cluster: clusterFoo
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterFoo_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterFoo_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true

View File

@@ -1,7 +1,7 @@
Cluster: clusterBar
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterBar_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterBar_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -9,8 +9,8 @@ server: ""
Cluster: clusterBar
target:
bootstrap-info: ""
cluster-kubeconf: clusterBar_target
bootstrapInfo: ""
clusterKubeconf: clusterBar_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -18,8 +18,8 @@ server: ""
Cluster: clusterBaz
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterBaz_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterBaz_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -27,8 +27,8 @@ server: ""
Cluster: clusterBaz
target:
bootstrap-info: ""
cluster-kubeconf: clusterBaz_target
bootstrapInfo: ""
clusterKubeconf: clusterBaz_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -36,8 +36,8 @@ server: ""
Cluster: clusterFoo
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterFoo_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterFoo_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -45,8 +45,8 @@ server: ""
Cluster: clusterFoo
target:
bootstrap-info: ""
cluster-kubeconf: clusterFoo_target
bootstrapInfo: ""
clusterKubeconf: clusterFoo_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true

View File

@@ -1,7 +1,7 @@
Cluster: clusterBar
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterBar_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterBar_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -9,8 +9,8 @@ server: ""
Cluster: clusterBar
target:
bootstrap-info: ""
cluster-kubeconf: clusterBar_target
bootstrapInfo: ""
clusterKubeconf: clusterBar_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -18,8 +18,8 @@ server: ""
Cluster: clusterBaz
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterBaz_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterBaz_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -27,8 +27,8 @@ server: ""
Cluster: clusterBaz
target:
bootstrap-info: ""
cluster-kubeconf: clusterBaz_target
bootstrapInfo: ""
clusterKubeconf: clusterBaz_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -36,8 +36,8 @@ server: ""
Cluster: clusterFoo
ephemeral:
bootstrap-info: ""
cluster-kubeconf: clusterFoo_ephemeral
bootstrapInfo: ""
clusterKubeconf: clusterFoo_ephemeral
LocationOfOrigin: ""
insecure-skip-tls-verify: true
@@ -45,8 +45,8 @@ server: ""
Cluster: clusterFoo
target:
bootstrap-info: ""
cluster-kubeconf: clusterFoo_target
bootstrapInfo: ""
clusterKubeconf: clusterFoo_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true

View File

@@ -1,7 +1,7 @@
Cluster: clusterFoo
target:
bootstrap-info: ""
cluster-kubeconf: clusterFoo_target
bootstrapInfo: ""
clusterKubeconf: clusterFoo_target
LocationOfOrigin: ""
insecure-skip-tls-verify: true

View File

@@ -1,5 +1,5 @@
Context: ContextBar
context-kubeconf: ContextBar_ephemeral
contextKubeconf: ContextBar_ephemeral
manifest: Manifest_ContextBar
LocationOfOrigin: ""
@@ -9,7 +9,7 @@ user: dummy_user
Context: ContextBaz
context-kubeconf: ContextBaz_ephemeral
contextKubeconf: ContextBaz_ephemeral
manifest: Manifest_ContextBaz
LocationOfOrigin: ""
@@ -19,7 +19,7 @@ user: dummy_user
Context: ContextFoo
context-kubeconf: ContextFoo_ephemeral
contextKubeconf: ContextFoo_ephemeral
manifest: Manifest_ContextFoo
LocationOfOrigin: ""

View File

@@ -1,5 +1,5 @@
Context: ContextFoo
context-kubeconf: ContextFoo_ephemeral
contextKubeconf: ContextFoo_ephemeral
manifest: Manifest_ContextFoo
LocationOfOrigin: ""

View File

@@ -1,5 +1,5 @@
Context: ContextBaz
context-kubeconf: ContextBaz_ephemeral
contextKubeconf: ContextBaz_ephemeral
manifest: Manifest_ContextBaz
LocationOfOrigin: ""

View File

@@ -1,5 +1,5 @@
Context: ContextBar
context-kubeconf: ContextBar_ephemeral
contextKubeconf: ContextBar_ephemeral
manifest: Manifest_ContextBar
LocationOfOrigin: ""
@@ -9,7 +9,7 @@ user: dummy_user
Context: ContextBaz
context-kubeconf: ContextBaz_ephemeral
contextKubeconf: ContextBaz_ephemeral
manifest: Manifest_ContextBaz
LocationOfOrigin: ""
@@ -19,7 +19,7 @@ user: dummy_user
Context: ContextFoo
context-kubeconf: ContextFoo_ephemeral
contextKubeconf: ContextFoo_ephemeral
manifest: Manifest_ContextFoo
LocationOfOrigin: ""