airship/airshipctl
Code Issues Proposed changes

Merge "Remove obsolete proxy substitutions"

Browse Source
This commit is contained in:
Zuul 2021-02-26 14:44:18 +00:00 committed by Gerrit Code Review
commit 681f8547c9
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site/test-site/target/workers/replacements/workers-env-vars.yaml
View File

@ -18,7 +18,6 @@ replacements:
kind: KubeadmConfigTemplate kind: KubeadmConfigTemplate
name: worker-1 name: worker-1
fieldrefs: fieldrefs:
- "spec.template.spec.preKubeadmCommands%REPLACEMENT_HTTP_PROXY%"
- "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_HTTP_PROXY%" - "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_HTTP_PROXY%"
- source: - source:
objref: objref:
@ -29,7 +28,6 @@ replacements:
kind: KubeadmConfigTemplate kind: KubeadmConfigTemplate
name: worker-1 name: worker-1
fieldrefs: fieldrefs:
- "spec.template.spec.preKubeadmCommands%REPLACEMENT_HTTPS_PROXY%"
- "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_HTTPS_PROXY%" - "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_HTTPS_PROXY%"
- source: - source:
objref: objref:
@ -40,5 +38,4 @@ replacements:
kind: KubeadmConfigTemplate kind: KubeadmConfigTemplate
name: worker-1 name: worker-1
fieldrefs: fieldrefs:
- "spec.template.spec.preKubeadmCommands%REPLACEMENT_NO_PROXY%"
- "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_NO_PROXY%" - "spec.template.spec.files[path=/etc/systemd/system/docker.service.d/http-proxy.conf].content%REPLACEMENT_NO_PROXY%"