Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inline Component Configuration Fix #3267

Merged
merged 1 commit into from
Aug 25, 2017
Merged

Inline Component Configuration Fix #3267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/model/bootstrapscript.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ func (b *BootstrapScript) ResourceNodeUp(ig *kops.InstanceGroup, cs *kops.Cluste
if err != nil {
return nil, err
}

return fi.WrapResource(templateResource), nil
}

Expand Down
1 change: 0 additions & 1 deletion pkg/model/bootstrapscript_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ func Test_ProxyFunc(t *testing.T) {
ps.ProxyExcludes = "www.google.com,www.kubernetes.io"

script = b.createProxyEnv(ps)
t.Logf(script)
if !strings.Contains(script, "export no_proxy="+ps.ProxyExcludes) {
t.Fatalf("script not setting no_proxy properly")
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/model/resources/nodeup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ function download-release() {
echo "== nodeup node config starting =="
ensure-install-dir

cat > cluster_spec.yaml << __EOF_CLUSTER_SPEC
cat > cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
{{ ClusterSpec }}
__EOF_CLUSTER_SPEC

cat > ig_spec.yaml << __EOF_IG_SPEC
cat > ig_spec.yaml << '__EOF_IG_SPEC'
{{ IGSpec }}
__EOF_IG_SPEC

cat > kube_env.yaml << __EOF_KUBE_ENV
cat > kube_env.yaml << '__EOF_KUBE_ENV'
{{ KubeEnv }}
__EOF_KUBE_ENV

Expand Down
6 changes: 3 additions & 3 deletions pkg/model/tests/data/bootstrapscript_0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function download-release() {
echo "== nodeup node config starting =="
ensure-install-dir

cat > cluster_spec.yaml << __EOF_CLUSTER_SPEC
cat > cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
nodeTags: something
docker:
Expand All @@ -166,7 +166,7 @@ masterKubelet:

__EOF_CLUSTER_SPEC

cat > ig_spec.yaml << __EOF_IG_SPEC
cat > ig_spec.yaml << '__EOF_IG_SPEC'
hooks:
- manifest: |-
Type=oneshot
Expand All @@ -183,7 +183,7 @@ taints:

__EOF_IG_SPEC

cat > kube_env.yaml << __EOF_KUBE_ENV
cat > kube_env.yaml << '__EOF_KUBE_ENV'
{}

__EOF_KUBE_ENV
Expand Down
6 changes: 3 additions & 3 deletions pkg/model/tests/data/bootstrapscript_1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function download-release() {
echo "== nodeup node config starting =="
ensure-install-dir

cat > cluster_spec.yaml << __EOF_CLUSTER_SPEC
cat > cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
nodeTags: something
docker:
Expand Down Expand Up @@ -175,7 +175,7 @@ masterKubelet:

__EOF_CLUSTER_SPEC

cat > ig_spec.yaml << __EOF_IG_SPEC
cat > ig_spec.yaml << '__EOF_IG_SPEC'
hooks:
- before:
- update-engine.service
Expand All @@ -201,7 +201,7 @@ taints:

__EOF_IG_SPEC

cat > kube_env.yaml << __EOF_KUBE_ENV
cat > kube_env.yaml << '__EOF_KUBE_ENV'
{}

__EOF_KUBE_ENV
Expand Down
6 changes: 3 additions & 3 deletions pkg/model/tests/data/bootstrapscript_2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function download-release() {
echo "== nodeup node config starting =="
ensure-install-dir

cat > cluster_spec.yaml << __EOF_CLUSTER_SPEC
cat > cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
nodeTags: something
docker:
Expand Down Expand Up @@ -176,7 +176,7 @@ masterKubelet:

__EOF_CLUSTER_SPEC

cat > ig_spec.yaml << __EOF_IG_SPEC
cat > ig_spec.yaml << '__EOF_IG_SPEC'
hooks:
- before:
- update-engine.service
Expand All @@ -203,7 +203,7 @@ taints:

__EOF_IG_SPEC

cat > kube_env.yaml << __EOF_KUBE_ENV
cat > kube_env.yaml << '__EOF_KUBE_ENV'
{}

__EOF_KUBE_ENV
Expand Down
6 changes: 3 additions & 3 deletions pkg/model/tests/data/bootstrapscript_3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function download-release() {
echo "== nodeup node config starting =="
ensure-install-dir

cat > cluster_spec.yaml << __EOF_CLUSTER_SPEC
cat > cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
nodeTags: something
docker:
Expand All @@ -158,7 +158,7 @@ kubelet:

__EOF_CLUSTER_SPEC

cat > ig_spec.yaml << __EOF_IG_SPEC
cat > ig_spec.yaml << '__EOF_IG_SPEC'
hooks:
- manifest: |-
Type=oneshot
Expand All @@ -175,7 +175,7 @@ taints:

__EOF_IG_SPEC

cat > kube_env.yaml << __EOF_KUBE_ENV
cat > kube_env.yaml << '__EOF_KUBE_ENV'
{}

__EOF_KUBE_ENV
Expand Down
6 changes: 3 additions & 3 deletions pkg/model/tests/data/bootstrapscript_4.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function download-release() {
echo "== nodeup node config starting =="
ensure-install-dir

cat > cluster_spec.yaml << __EOF_CLUSTER_SPEC
cat > cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
nodeTags: something
docker:
Expand All @@ -167,7 +167,7 @@ kubelet:

__EOF_CLUSTER_SPEC

cat > ig_spec.yaml << __EOF_IG_SPEC
cat > ig_spec.yaml << '__EOF_IG_SPEC'
hooks:
- before:
- update-engine.service
Expand All @@ -193,7 +193,7 @@ taints:

__EOF_IG_SPEC

cat > kube_env.yaml << __EOF_KUBE_ENV
cat > kube_env.yaml << '__EOF_KUBE_ENV'
{}

__EOF_KUBE_ENV
Expand Down
6 changes: 3 additions & 3 deletions pkg/model/tests/data/bootstrapscript_5.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function download-release() {
echo "== nodeup node config starting =="
ensure-install-dir

cat > cluster_spec.yaml << __EOF_CLUSTER_SPEC
cat > cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
nodeTags: something
docker:
Expand All @@ -168,7 +168,7 @@ kubelet:

__EOF_CLUSTER_SPEC

cat > ig_spec.yaml << __EOF_IG_SPEC
cat > ig_spec.yaml << '__EOF_IG_SPEC'
hooks:
- before:
- update-engine.service
Expand All @@ -195,7 +195,7 @@ taints:

__EOF_IG_SPEC

cat > kube_env.yaml << __EOF_KUBE_ENV
cat > kube_env.yaml << '__EOF_KUBE_ENV'
{}

__EOF_KUBE_ENV
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/minimal/cloudformation.json
View file
Open in desktop

Large diffs are not rendered by default.