mirror of https://github.com/kubernetes/kops.git
hack/update-expected.sh
This commit is contained in:
parent
96115de2eb
commit
48404f87fd
|
|
@ -40,16 +40,16 @@ contents: |
|
|||
|
||||
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
|
||||
SystemdCgroup = true
|
||||
path: /etc/containerd/config-kops.toml
|
||||
path: /etc/containerd/config.toml
|
||||
type: file
|
||||
---
|
||||
afterFiles:
|
||||
- /etc/containerd/config-kops.toml
|
||||
- /etc/containerd/config.toml
|
||||
contents: |-
|
||||
[Service]
|
||||
EnvironmentFile=/etc/environment
|
||||
ExecStart=
|
||||
ExecStart=/usr/bin/containerd --config /etc/containerd/config-kops.toml
|
||||
ExecStart=/usr/bin/containerd --config /etc/containerd/config.toml
|
||||
onChangeExecute:
|
||||
- - systemctl
|
||||
- daemon-reload
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
contents: |
|
||||
disabled_plugins = ["cri"]
|
||||
path: /etc/containerd/config-kops.toml
|
||||
path: /etc/containerd/config.toml
|
||||
type: file
|
||||
---
|
||||
contents: CONTAINERD_OPTS=--log-level=info
|
||||
|
|
@ -214,7 +214,7 @@ definition: |
|
|||
EnvironmentFile=/etc/sysconfig/containerd
|
||||
EnvironmentFile=/etc/environment
|
||||
ExecStartPre=-/sbin/modprobe overlay
|
||||
ExecStart=/usr/bin/containerd -c /etc/containerd/config-kops.toml "$CONTAINERD_OPTS"
|
||||
ExecStart=/usr/bin/containerd -c /etc/containerd/config.toml "$CONTAINERD_OPTS"
|
||||
Delegate=yes
|
||||
KillMode=process
|
||||
Restart=always
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
contents: |
|
||||
disabled_plugins = ["cri"]
|
||||
path: /etc/containerd/config-kops.toml
|
||||
path: /etc/containerd/config.toml
|
||||
type: file
|
||||
---
|
||||
contents: CONTAINERD_OPTS=--log-level=info
|
||||
|
|
@ -214,7 +214,7 @@ definition: |
|
|||
EnvironmentFile=/etc/sysconfig/containerd
|
||||
EnvironmentFile=/etc/environment
|
||||
ExecStartPre=-/sbin/modprobe overlay
|
||||
ExecStart=/usr/bin/containerd -c /etc/containerd/config-kops.toml "$CONTAINERD_OPTS"
|
||||
ExecStart=/usr/bin/containerd -c /etc/containerd/config.toml "$CONTAINERD_OPTS"
|
||||
Type=notify
|
||||
Delegate=yes
|
||||
KillMode=process
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ contents: |
|
|||
|
||||
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
|
||||
SystemdCgroup = true
|
||||
path: /etc/containerd/config-kops.toml
|
||||
path: /etc/containerd/config.toml
|
||||
type: file
|
||||
---
|
||||
contents: |2
|
||||
|
|
@ -347,7 +347,7 @@ definition: |
|
|||
EnvironmentFile=/etc/sysconfig/containerd
|
||||
EnvironmentFile=/etc/environment
|
||||
ExecStartPre=-/sbin/modprobe overlay
|
||||
ExecStart=/usr/bin/containerd -c /etc/containerd/config-kops.toml "$CONTAINERD_OPTS"
|
||||
ExecStart=/usr/bin/containerd -c /etc/containerd/config.toml "$CONTAINERD_OPTS"
|
||||
Type=notify
|
||||
Delegate=yes
|
||||
KillMode=process
|
||||
|
|
|
|||
Loading…
Reference in New Issue