mirror of https://github.com/kubernetes/kops.git
hack/update-expected.sh
This commit is contained in:
parent
3f99d04ca5
commit
da4af99967
|
@ -130,7 +130,7 @@ ClusterName: minimal.example.com
|
||||||
ConfigBase: memfs://tests/minimal.example.com
|
ConfigBase: memfs://tests/minimal.example.com
|
||||||
InstanceGroupName: master-us-test-1a
|
InstanceGroupName: master-us-test-1a
|
||||||
InstanceGroupRole: ControlPlane
|
InstanceGroupRole: ControlPlane
|
||||||
NodeupConfigHash: xbmJGssuIxsJRK9XhaKClsBg2o8f0AgSGPWoqHTTX7s=
|
NodeupConfigHash: PtkgcAnStiVeR9dBVfWvjbyz7gMCuGX83Y49gsjcrqU=
|
||||||
|
|
||||||
__EOF_KUBE_ENV
|
__EOF_KUBE_ENV
|
||||||
|
|
||||||
|
|
|
@ -170,6 +170,8 @@ spec:
|
||||||
clusterDomain: cluster.local
|
clusterDomain: cluster.local
|
||||||
enableDebuggingHandlers: true
|
enableDebuggingHandlers: true
|
||||||
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
|
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
|
||||||
|
featureGates:
|
||||||
|
ImageVolume: "true"
|
||||||
kubeconfigPath: /var/lib/kubelet/kubeconfig
|
kubeconfigPath: /var/lib/kubelet/kubeconfig
|
||||||
logLevel: 2
|
logLevel: 2
|
||||||
podInfraContainerImage: registry.k8s.io/pause:3.9
|
podInfraContainerImage: registry.k8s.io/pause:3.9
|
||||||
|
|
|
@ -38,80 +38,34 @@ spec:
|
||||||
name: pki
|
name: pki
|
||||||
- mountPath: /opt
|
- mountPath: /opt
|
||||||
name: opt
|
name: opt
|
||||||
|
- mountPath: /opt/etcd-v3.4.13
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- mountPath: /opt/etcd-v3.4.3
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- mountPath: /opt/etcd-v3.5.0
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.1
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.13
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.17
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.21
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.3
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.4
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.6
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.7
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.9
|
||||||
|
name: etcd-v3-5-21
|
||||||
- mountPath: /var/log/etcd.log
|
- mountPath: /var/log/etcd.log
|
||||||
name: varlogetcd
|
name: varlogetcd
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
hostPID: true
|
hostPID: true
|
||||||
initContainers:
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/kops-utils/
|
|
||||||
- --src=/ko-app/kops-utils-cp
|
|
||||||
command:
|
|
||||||
- /ko-app/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: kops-utils-cp
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/etcd-v3.4.13
|
|
||||||
- --src=/usr/local/bin/etcd
|
|
||||||
- --src=/usr/local/bin/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/etcd:v3.4.13
|
|
||||||
name: init-etcd-3-4-13
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/etcd-v3.5.21
|
|
||||||
- --src=/usr/local/bin/etcd
|
|
||||||
- --src=/usr/local/bin/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/etcd:v3.5.21
|
|
||||||
name: init-etcd-3-5-21
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --symlink
|
|
||||||
- --target-dir=/opt/etcd-v3.4.3
|
|
||||||
- --src=/opt/etcd-v3.4.13/etcd
|
|
||||||
- --src=/opt/etcd-v3.4.13/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: init-etcd-symlinks-3-4-13
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --symlink
|
|
||||||
- --target-dir=/opt/etcd-v3.5.0
|
|
||||||
- --target-dir=/opt/etcd-v3.5.1
|
|
||||||
- --target-dir=/opt/etcd-v3.5.13
|
|
||||||
- --target-dir=/opt/etcd-v3.5.17
|
|
||||||
- --target-dir=/opt/etcd-v3.5.3
|
|
||||||
- --target-dir=/opt/etcd-v3.5.4
|
|
||||||
- --target-dir=/opt/etcd-v3.5.6
|
|
||||||
- --target-dir=/opt/etcd-v3.5.7
|
|
||||||
- --target-dir=/opt/etcd-v3.5.9
|
|
||||||
- --src=/opt/etcd-v3.5.21/etcd
|
|
||||||
- --src=/opt/etcd-v3.5.21/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: init-etcd-symlinks-3-5-21
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
priorityClassName: system-cluster-critical
|
priorityClassName: system-cluster-critical
|
||||||
tolerations:
|
tolerations:
|
||||||
- key: CriticalAddonsOnly
|
- key: CriticalAddonsOnly
|
||||||
|
@ -131,6 +85,14 @@ spec:
|
||||||
name: pki
|
name: pki
|
||||||
- emptyDir: {}
|
- emptyDir: {}
|
||||||
name: opt
|
name: opt
|
||||||
|
- image:
|
||||||
|
pullPolicy: IfNotPresent
|
||||||
|
reference: registry.k8s.io/etcd:v3.4.13
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- image:
|
||||||
|
pullPolicy: IfNotPresent
|
||||||
|
reference: registry.k8s.io/etcd:v3.5.21
|
||||||
|
name: etcd-v3-5-21
|
||||||
- hostPath:
|
- hostPath:
|
||||||
path: /var/log/etcd-events.log
|
path: /var/log/etcd-events.log
|
||||||
type: FileOrCreate
|
type: FileOrCreate
|
||||||
|
|
|
@ -38,80 +38,34 @@ spec:
|
||||||
name: pki
|
name: pki
|
||||||
- mountPath: /opt
|
- mountPath: /opt
|
||||||
name: opt
|
name: opt
|
||||||
|
- mountPath: /opt/etcd-v3.4.13
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- mountPath: /opt/etcd-v3.4.3
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- mountPath: /opt/etcd-v3.5.0
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.1
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.13
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.17
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.21
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.3
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.4
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.6
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.7
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.9
|
||||||
|
name: etcd-v3-5-21
|
||||||
- mountPath: /var/log/etcd.log
|
- mountPath: /var/log/etcd.log
|
||||||
name: varlogetcd
|
name: varlogetcd
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
hostPID: true
|
hostPID: true
|
||||||
initContainers:
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/kops-utils/
|
|
||||||
- --src=/ko-app/kops-utils-cp
|
|
||||||
command:
|
|
||||||
- /ko-app/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: kops-utils-cp
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/etcd-v3.4.13
|
|
||||||
- --src=/usr/local/bin/etcd
|
|
||||||
- --src=/usr/local/bin/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/etcd:v3.4.13
|
|
||||||
name: init-etcd-3-4-13
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/etcd-v3.5.21
|
|
||||||
- --src=/usr/local/bin/etcd
|
|
||||||
- --src=/usr/local/bin/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/etcd:v3.5.21
|
|
||||||
name: init-etcd-3-5-21
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --symlink
|
|
||||||
- --target-dir=/opt/etcd-v3.4.3
|
|
||||||
- --src=/opt/etcd-v3.4.13/etcd
|
|
||||||
- --src=/opt/etcd-v3.4.13/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: init-etcd-symlinks-3-4-13
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --symlink
|
|
||||||
- --target-dir=/opt/etcd-v3.5.0
|
|
||||||
- --target-dir=/opt/etcd-v3.5.1
|
|
||||||
- --target-dir=/opt/etcd-v3.5.13
|
|
||||||
- --target-dir=/opt/etcd-v3.5.17
|
|
||||||
- --target-dir=/opt/etcd-v3.5.3
|
|
||||||
- --target-dir=/opt/etcd-v3.5.4
|
|
||||||
- --target-dir=/opt/etcd-v3.5.6
|
|
||||||
- --target-dir=/opt/etcd-v3.5.7
|
|
||||||
- --target-dir=/opt/etcd-v3.5.9
|
|
||||||
- --src=/opt/etcd-v3.5.21/etcd
|
|
||||||
- --src=/opt/etcd-v3.5.21/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: init-etcd-symlinks-3-5-21
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
priorityClassName: system-cluster-critical
|
priorityClassName: system-cluster-critical
|
||||||
tolerations:
|
tolerations:
|
||||||
- key: CriticalAddonsOnly
|
- key: CriticalAddonsOnly
|
||||||
|
@ -131,6 +85,14 @@ spec:
|
||||||
name: pki
|
name: pki
|
||||||
- emptyDir: {}
|
- emptyDir: {}
|
||||||
name: opt
|
name: opt
|
||||||
|
- image:
|
||||||
|
pullPolicy: IfNotPresent
|
||||||
|
reference: registry.k8s.io/etcd:v3.4.13
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- image:
|
||||||
|
pullPolicy: IfNotPresent
|
||||||
|
reference: registry.k8s.io/etcd:v3.5.21
|
||||||
|
name: etcd-v3-5-21
|
||||||
- hostPath:
|
- hostPath:
|
||||||
path: /var/log/etcd.log
|
path: /var/log/etcd.log
|
||||||
type: FileOrCreate
|
type: FileOrCreate
|
||||||
|
|
|
@ -287,6 +287,8 @@ KubeletConfig:
|
||||||
clusterDomain: cluster.local
|
clusterDomain: cluster.local
|
||||||
enableDebuggingHandlers: true
|
enableDebuggingHandlers: true
|
||||||
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
|
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
|
||||||
|
featureGates:
|
||||||
|
ImageVolume: "true"
|
||||||
kubeconfigPath: /var/lib/kubelet/kubeconfig
|
kubeconfigPath: /var/lib/kubelet/kubeconfig
|
||||||
logLevel: 2
|
logLevel: 2
|
||||||
nodeLabels:
|
nodeLabels:
|
||||||
|
|
|
@ -130,7 +130,7 @@ ClusterName: minimal.example.com
|
||||||
ConfigBase: memfs://tests/minimal.example.com
|
ConfigBase: memfs://tests/minimal.example.com
|
||||||
InstanceGroupName: master-us-test-1a
|
InstanceGroupName: master-us-test-1a
|
||||||
InstanceGroupRole: ControlPlane
|
InstanceGroupRole: ControlPlane
|
||||||
NodeupConfigHash: U8Cc2occS9dwCHbAn8DC5s6yGK9OvKSeMOHSbbuEEls=
|
NodeupConfigHash: 7LXIccGeBgv+GPtggY8yFTHYgeCSqNF8ybqN0ho9Hrk=
|
||||||
|
|
||||||
__EOF_KUBE_ENV
|
__EOF_KUBE_ENV
|
||||||
|
|
||||||
|
|
|
@ -169,6 +169,8 @@ spec:
|
||||||
clusterDomain: cluster.local
|
clusterDomain: cluster.local
|
||||||
enableDebuggingHandlers: true
|
enableDebuggingHandlers: true
|
||||||
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
|
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
|
||||||
|
featureGates:
|
||||||
|
ImageVolume: "true"
|
||||||
kubeconfigPath: /var/lib/kubelet/kubeconfig
|
kubeconfigPath: /var/lib/kubelet/kubeconfig
|
||||||
logLevel: 2
|
logLevel: 2
|
||||||
podInfraContainerImage: registry.k8s.io/pause:3.9
|
podInfraContainerImage: registry.k8s.io/pause:3.9
|
||||||
|
|
|
@ -38,80 +38,34 @@ spec:
|
||||||
name: pki
|
name: pki
|
||||||
- mountPath: /opt
|
- mountPath: /opt
|
||||||
name: opt
|
name: opt
|
||||||
|
- mountPath: /opt/etcd-v3.4.13
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- mountPath: /opt/etcd-v3.4.3
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- mountPath: /opt/etcd-v3.5.0
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.1
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.13
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.17
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.21
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.3
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.4
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.6
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.7
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.9
|
||||||
|
name: etcd-v3-5-21
|
||||||
- mountPath: /var/log/etcd.log
|
- mountPath: /var/log/etcd.log
|
||||||
name: varlogetcd
|
name: varlogetcd
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
hostPID: true
|
hostPID: true
|
||||||
initContainers:
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/kops-utils/
|
|
||||||
- --src=/ko-app/kops-utils-cp
|
|
||||||
command:
|
|
||||||
- /ko-app/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: kops-utils-cp
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/etcd-v3.4.13
|
|
||||||
- --src=/usr/local/bin/etcd
|
|
||||||
- --src=/usr/local/bin/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/etcd:v3.4.13
|
|
||||||
name: init-etcd-3-4-13
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/etcd-v3.5.21
|
|
||||||
- --src=/usr/local/bin/etcd
|
|
||||||
- --src=/usr/local/bin/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/etcd:v3.5.21
|
|
||||||
name: init-etcd-3-5-21
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --symlink
|
|
||||||
- --target-dir=/opt/etcd-v3.4.3
|
|
||||||
- --src=/opt/etcd-v3.4.13/etcd
|
|
||||||
- --src=/opt/etcd-v3.4.13/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: init-etcd-symlinks-3-4-13
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --symlink
|
|
||||||
- --target-dir=/opt/etcd-v3.5.0
|
|
||||||
- --target-dir=/opt/etcd-v3.5.1
|
|
||||||
- --target-dir=/opt/etcd-v3.5.13
|
|
||||||
- --target-dir=/opt/etcd-v3.5.17
|
|
||||||
- --target-dir=/opt/etcd-v3.5.3
|
|
||||||
- --target-dir=/opt/etcd-v3.5.4
|
|
||||||
- --target-dir=/opt/etcd-v3.5.6
|
|
||||||
- --target-dir=/opt/etcd-v3.5.7
|
|
||||||
- --target-dir=/opt/etcd-v3.5.9
|
|
||||||
- --src=/opt/etcd-v3.5.21/etcd
|
|
||||||
- --src=/opt/etcd-v3.5.21/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: init-etcd-symlinks-3-5-21
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
priorityClassName: system-cluster-critical
|
priorityClassName: system-cluster-critical
|
||||||
tolerations:
|
tolerations:
|
||||||
- key: CriticalAddonsOnly
|
- key: CriticalAddonsOnly
|
||||||
|
@ -131,6 +85,14 @@ spec:
|
||||||
name: pki
|
name: pki
|
||||||
- emptyDir: {}
|
- emptyDir: {}
|
||||||
name: opt
|
name: opt
|
||||||
|
- image:
|
||||||
|
pullPolicy: IfNotPresent
|
||||||
|
reference: registry.k8s.io/etcd:v3.4.13
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- image:
|
||||||
|
pullPolicy: IfNotPresent
|
||||||
|
reference: registry.k8s.io/etcd:v3.5.21
|
||||||
|
name: etcd-v3-5-21
|
||||||
- hostPath:
|
- hostPath:
|
||||||
path: /var/log/etcd-events.log
|
path: /var/log/etcd-events.log
|
||||||
type: FileOrCreate
|
type: FileOrCreate
|
||||||
|
|
|
@ -38,80 +38,34 @@ spec:
|
||||||
name: pki
|
name: pki
|
||||||
- mountPath: /opt
|
- mountPath: /opt
|
||||||
name: opt
|
name: opt
|
||||||
|
- mountPath: /opt/etcd-v3.4.13
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- mountPath: /opt/etcd-v3.4.3
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- mountPath: /opt/etcd-v3.5.0
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.1
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.13
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.17
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.21
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.3
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.4
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.6
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.7
|
||||||
|
name: etcd-v3-5-21
|
||||||
|
- mountPath: /opt/etcd-v3.5.9
|
||||||
|
name: etcd-v3-5-21
|
||||||
- mountPath: /var/log/etcd.log
|
- mountPath: /var/log/etcd.log
|
||||||
name: varlogetcd
|
name: varlogetcd
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
hostPID: true
|
hostPID: true
|
||||||
initContainers:
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/kops-utils/
|
|
||||||
- --src=/ko-app/kops-utils-cp
|
|
||||||
command:
|
|
||||||
- /ko-app/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: kops-utils-cp
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/etcd-v3.4.13
|
|
||||||
- --src=/usr/local/bin/etcd
|
|
||||||
- --src=/usr/local/bin/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/etcd:v3.4.13
|
|
||||||
name: init-etcd-3-4-13
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --target-dir=/opt/etcd-v3.5.21
|
|
||||||
- --src=/usr/local/bin/etcd
|
|
||||||
- --src=/usr/local/bin/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/etcd:v3.5.21
|
|
||||||
name: init-etcd-3-5-21
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --symlink
|
|
||||||
- --target-dir=/opt/etcd-v3.4.3
|
|
||||||
- --src=/opt/etcd-v3.4.13/etcd
|
|
||||||
- --src=/opt/etcd-v3.4.13/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: init-etcd-symlinks-3-4-13
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
- args:
|
|
||||||
- --symlink
|
|
||||||
- --target-dir=/opt/etcd-v3.5.0
|
|
||||||
- --target-dir=/opt/etcd-v3.5.1
|
|
||||||
- --target-dir=/opt/etcd-v3.5.13
|
|
||||||
- --target-dir=/opt/etcd-v3.5.17
|
|
||||||
- --target-dir=/opt/etcd-v3.5.3
|
|
||||||
- --target-dir=/opt/etcd-v3.5.4
|
|
||||||
- --target-dir=/opt/etcd-v3.5.6
|
|
||||||
- --target-dir=/opt/etcd-v3.5.7
|
|
||||||
- --target-dir=/opt/etcd-v3.5.9
|
|
||||||
- --src=/opt/etcd-v3.5.21/etcd
|
|
||||||
- --src=/opt/etcd-v3.5.21/etcdctl
|
|
||||||
command:
|
|
||||||
- /opt/kops-utils/kops-utils-cp
|
|
||||||
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
|
|
||||||
name: init-etcd-symlinks-3-5-21
|
|
||||||
resources: {}
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /opt
|
|
||||||
name: opt
|
|
||||||
priorityClassName: system-cluster-critical
|
priorityClassName: system-cluster-critical
|
||||||
tolerations:
|
tolerations:
|
||||||
- key: CriticalAddonsOnly
|
- key: CriticalAddonsOnly
|
||||||
|
@ -131,6 +85,14 @@ spec:
|
||||||
name: pki
|
name: pki
|
||||||
- emptyDir: {}
|
- emptyDir: {}
|
||||||
name: opt
|
name: opt
|
||||||
|
- image:
|
||||||
|
pullPolicy: IfNotPresent
|
||||||
|
reference: registry.k8s.io/etcd:v3.4.13
|
||||||
|
name: etcd-v3-4-13
|
||||||
|
- image:
|
||||||
|
pullPolicy: IfNotPresent
|
||||||
|
reference: registry.k8s.io/etcd:v3.5.21
|
||||||
|
name: etcd-v3-5-21
|
||||||
- hostPath:
|
- hostPath:
|
||||||
path: /var/log/etcd.log
|
path: /var/log/etcd.log
|
||||||
type: FileOrCreate
|
type: FileOrCreate
|
||||||
|
|
|
@ -287,6 +287,8 @@ KubeletConfig:
|
||||||
clusterDomain: cluster.local
|
clusterDomain: cluster.local
|
||||||
enableDebuggingHandlers: true
|
enableDebuggingHandlers: true
|
||||||
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
|
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
|
||||||
|
featureGates:
|
||||||
|
ImageVolume: "true"
|
||||||
kubeconfigPath: /var/lib/kubelet/kubeconfig
|
kubeconfigPath: /var/lib/kubelet/kubeconfig
|
||||||
logLevel: 2
|
logLevel: 2
|
||||||
nodeLabels:
|
nodeLabels:
|
||||||
|
|
Loading…
Reference in New Issue