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

Jump to bottom

[release/v1.2] Remove duplicate file resource from flatcar OSP #319

Merged
merged 1 commit into from
Oct 12, 2023
Merged

[release/v1.2] Remove duplicate file resource from flatcar OSP #319

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
19 changes: 0 additions & 19 deletions deploy/osps/default/osp-flatcar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,25 +559,6 @@ spec:
data: |
{{ .KubernetesCACert }}

- path: /etc/systemd/system/setup.service
permissions: 644
content:
inline:
encoding: b64
data: |
[Install]
WantedBy=multi-user.target

[Unit]
Requires=network-online.target
After=network-online.target

[Service]
Type=oneshot
RemainAfterExit=true
EnvironmentFile=-/etc/environment
ExecStart=/opt/bin/supervise.sh /opt/bin/setup

- path: /etc/systemd/system/kubelet.service
content:
inline:
Expand Down
18 changes: 0 additions & 18 deletions pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,24 +400,6 @@ spec:
-----END CERTIFICATE-----
path: /etc/kubernetes/pki/ca.crt
permissions: 644
- content:
inline:
data: |
[Install]
WantedBy=multi-user.target

[Unit]
Requires=network-online.target
After=network-online.target

[Service]
Type=oneshot
RemainAfterExit=true
EnvironmentFile=-/etc/environment
ExecStart=/opt/bin/supervise.sh /opt/bin/setup
encoding: b64
path: /etc/systemd/system/setup.service
permissions: 644
- content:
inline:
data: |
Expand Down
Loading