diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index b36e27781d9b7..803c180e39fd5 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -185,6 +185,8 @@ spec: # TODO: Would be nice to scope this more tightly, but needed for volume mounting - mountPath: /rootfs name: rootfs + - mountPath: /run + name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki hostNetwork: true @@ -194,6 +196,10 @@ spec: path: / type: Directory name: rootfs + - hostPath: + path: /run + type: DirectoryOrCreate + name: run - hostPath: path: /etc/kubernetes/pki/etcd-manager type: DirectoryOrCreate diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml index d96b6369ad74a..790f17fc4422b 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml @@ -94,6 +94,8 @@ Contents: | volumeMounts: - mountPath: /rootfs name: rootfs + - mountPath: /run + name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /var/log/etcd.log @@ -109,6 +111,10 @@ Contents: | path: / type: Directory name: rootfs + - hostPath: + path: /run + type: DirectoryOrCreate + name: run - hostPath: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate @@ -159,6 +165,8 @@ Contents: | volumeMounts: - mountPath: /rootfs name: rootfs + - mountPath: /run + name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /var/log/etcd.log @@ -174,6 +182,10 @@ Contents: | path: / type: Directory name: rootfs + - hostPath: + path: /run + type: DirectoryOrCreate + name: run - hostPath: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate diff --git a/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml b/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml index 0547f5eb217ce..255a6f7f2af51 100644 --- a/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/old_versions_mount_hosts/tasks.yaml @@ -94,6 +94,8 @@ Contents: | volumeMounts: - mountPath: /rootfs name: rootfs + - mountPath: /run + name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /etc/hosts @@ -111,6 +113,10 @@ Contents: | path: / type: Directory name: rootfs + - hostPath: + path: /run + type: DirectoryOrCreate + name: run - hostPath: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate @@ -165,6 +171,8 @@ Contents: | volumeMounts: - mountPath: /rootfs name: rootfs + - mountPath: /run + name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /etc/hosts @@ -182,6 +190,10 @@ Contents: | path: / type: Directory name: rootfs + - hostPath: + path: /run + type: DirectoryOrCreate + name: run - hostPath: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml index 8c0782bc5d312..e56202e09abf6 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml @@ -97,6 +97,8 @@ Contents: | volumeMounts: - mountPath: /rootfs name: rootfs + - mountPath: /run + name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /var/log/etcd.log @@ -112,6 +114,10 @@ Contents: | path: / type: Directory name: rootfs + - hostPath: + path: /run + type: DirectoryOrCreate + name: run - hostPath: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate @@ -165,6 +171,8 @@ Contents: | volumeMounts: - mountPath: /rootfs name: rootfs + - mountPath: /run + name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /var/log/etcd.log @@ -180,6 +188,10 @@ Contents: | path: / type: Directory name: rootfs + - hostPath: + path: /run + type: DirectoryOrCreate + name: run - hostPath: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate diff --git a/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml b/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml index 064dd59ba1f88..087fa3ccee8b6 100644 --- a/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/pollinterval/tasks.yaml @@ -94,6 +94,8 @@ Contents: | volumeMounts: - mountPath: /rootfs name: rootfs + - mountPath: /run + name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /var/log/etcd.log @@ -109,6 +111,10 @@ Contents: | path: / type: Directory name: rootfs + - hostPath: + path: /run + type: DirectoryOrCreate + name: run - hostPath: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate @@ -159,6 +165,8 @@ Contents: | volumeMounts: - mountPath: /rootfs name: rootfs + - mountPath: /run + name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /var/log/etcd.log @@ -174,6 +182,10 @@ Contents: | path: / type: Directory name: rootfs + - hostPath: + path: /run + type: DirectoryOrCreate + name: run - hostPath: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml index 31e97aaa1269b..17e323e91fdb3 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml @@ -103,6 +103,8 @@ Contents: | volumeMounts: - mountPath: /rootfs name: rootfs + - mountPath: /run + name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /etc/hosts @@ -120,6 +122,10 @@ Contents: | path: / type: Directory name: rootfs + - hostPath: + path: /run + type: DirectoryOrCreate + name: run - hostPath: path: /etc/kubernetes/pki/etcd-manager-events type: DirectoryOrCreate @@ -183,6 +189,8 @@ Contents: | volumeMounts: - mountPath: /rootfs name: rootfs + - mountPath: /run + name: run - mountPath: /etc/kubernetes/pki/etcd-manager name: pki - mountPath: /etc/hosts @@ -200,6 +208,10 @@ Contents: | path: / type: Directory name: rootfs + - hostPath: + path: /run + type: DirectoryOrCreate + name: run - hostPath: path: /etc/kubernetes/pki/etcd-manager-main type: DirectoryOrCreate