kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hack/update-expected.sh

This commit is contained in:
John Gardiner Myers 2021-05-07 16:21:55 -07:00
parent d3469d6ec2
commit 36f93d0069
12 changed files with 109 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml
View File

@ -3,7 +3,7 @@ path: /etc/kubernetes/manifests
type: directory
---
contents: |
DAEMON_ARGS="--client-ca-file=/srv/kubernetes/ca.crt --feature-gates=AllowExtTrafficLocalEndpoints=false,ExperimentalCriticalPodAnnotation=true --node-labels=kubernetes.io/role=node,node-role.kubernetes.io/node= --pod-manifest-path=/etc/kubernetes/manifests --register-schedulable=true --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/"
DAEMON_ARGS="--client-ca-file=/srv/kubernetes/ca.crt --feature-gates=AllowExtTrafficLocalEndpoints=false,ExperimentalCriticalPodAnnotation=true --pod-manifest-path=/etc/kubernetes/manifests --register-schedulable=true --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/"
HOME="/root"
path: /etc/sysconfig/kubelet
type: file

12
pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
View File

@ -107,8 +107,6 @@ Contents: |
name: run
- mountPath: /etc/kubernetes/pki/etcd-manager
name: pki
- mountPath: /etc/hosts
name: hosts
- mountPath: /var/log/etcd.log
name: varlogetcd
hostNetwork: true
@ -130,10 +128,6 @@ Contents: |
path: /etc/kubernetes/pki/etcd-manager-events
type: DirectoryOrCreate
name: pki
- hostPath:
path: /etc/hosts
type: File
name: hosts
- hostPath:
path: /var/log/etcd-events.log
type: FileOrCreate
@ -193,8 +187,6 @@ Contents: |
name: run
- mountPath: /etc/kubernetes/pki/etcd-manager
name: pki
- mountPath: /etc/hosts
name: hosts
- mountPath: /var/log/etcd.log
name: varlogetcd
hostNetwork: true
@ -216,10 +208,6 @@ Contents: |
path: /etc/kubernetes/pki/etcd-manager-main
type: DirectoryOrCreate
name: pki
- hostPath:
path: /etc/hosts
type: File
name: hosts
- hostPath:
path: /var/log/etcd.log
type: FileOrCreate

94
tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml Normal file
View File

@ -0,0 +1,94 @@
apiVersion: kops.k8s.io/v1alpha2
kind: Cluster
metadata:
creationTimestamp: "2017-01-01T00:00:00Z"
name: minimal.example.com
spec:
api:
dns: {}
authorization:
rbac: {}
channel: stable
cloudProvider: aws
configBase: memfs://tests/minimal.example.com
containerRuntime: containerd
etcdClusters:
- cpuRequest: 200m
etcdMembers:
- encryptedVolume: true
instanceGroup: master-us-test-1a
name: a
memoryRequest: 100Mi
name: main
- cpuRequest: 100m
etcdMembers:
- encryptedVolume: true
instanceGroup: master-us-test-1a
name: a
memoryRequest: 100Mi
name: events
iam:
allowContainerRegistry: true
legacy: false
kubelet:
anonymousAuth: false
kubernetesApiAccess:
- 0.0.0.0/0
kubernetesVersion: v1.22.0
masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16
networking:
cni: {}
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
type: Public
zone: us-test-1a
topology:
dns:
type: Public
masters: public
nodes: public
---
apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: "2017-01-01T00:00:00Z"
labels:
kops.k8s.io/cluster: minimal.example.com
name: master-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: m3.medium
maxSize: 1
minSize: 1
nodeLabels:
kops.k8s.io/instancegroup: master-us-test-1a
role: Master
subnets:
- us-test-1a
---
apiVersion: kops.k8s.io/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: "2017-01-01T00:00:00Z"
labels:
kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210415
machineType: t2.medium
maxSize: 1
minSize: 1
nodeLabels:
kops.k8s.io/instancegroup: nodes-us-test-1a
role: Node
subnets:
- us-test-1a

38
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
View File

@ -5,9 +5,8 @@ metadata:
spec:
addons:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: d72db834feceb637342b58e910479e68f9071db2
manifestHash: e225462a29ef1cf9c6201f1375cd2511f7a1f665
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
@ -20,19 +19,12 @@ spec:
k8s-addon: core.addons.k8s.io
version: 1.4.0
- id: k8s-1.12
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
manifestHash: 9115bb04f06321decd39b1588a93e31e48a40c06
name: kube-dns.addons.k8s.io
manifest: coredns.addons.k8s.io/k8s-1.12.yaml
manifestHash: 70f2e607f0df7b9c80eb240984db4564b5de5ad8
name: coredns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.15.13-kops.3
- id: k8s-1.8
manifest: rbac.addons.k8s.io/k8s-1.8.yaml
manifestHash: a9ebd499f4d73dfa12cd6f0f762d3b143aecada6
name: rbac.addons.k8s.io
selector:
k8s-addon: rbac.addons.k8s.io
version: 1.8.0
k8s-addon: coredns.addons.k8s.io
version: 1.7.0-kops.3
- id: k8s-1.9
manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml
manifestHash: 1dbad74e01965afc2c32ca822d16c204d015db82
@ -54,31 +46,13 @@ spec:
k8s-addon: dns-controller.addons.k8s.io
version: 1.22.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: v1.7.0
kubernetesVersion: <1.15.0
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
manifestHash: 0a699ecad09b62fd94da8b97d1c2204c716c2b8f
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: k8s-1.12
kubernetesVersion: <1.16.0
manifest: networking.amazon-vpc-routed-eni/k8s-1.12.yaml
manifestHash: ae25f3b938e95a2649927d8b2047ed0e5f58539f
name: networking.amazon-vpc-routed-eni
selector:
role.kubernetes.io/networking: "1"
version: 1.5.5-kops.1
- id: k8s-1.16
kubernetesVersion: '>=1.16.0'
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: ba5c98ae679d9feb8a84a063075acee4956cc126
name: networking.amazon-vpc-routed-eni

40
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View File

@ -5,9 +5,8 @@ metadata:
spec:
addons:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: d72db834feceb637342b58e910479e68f9071db2
manifestHash: e225462a29ef1cf9c6201f1375cd2511f7a1f665
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
@ -20,19 +19,12 @@ spec:
k8s-addon: core.addons.k8s.io
version: 1.4.0
- id: k8s-1.12
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml
manifestHash: 9115bb04f06321decd39b1588a93e31e48a40c06
name: kube-dns.addons.k8s.io
manifest: coredns.addons.k8s.io/k8s-1.12.yaml
manifestHash: 70f2e607f0df7b9c80eb240984db4564b5de5ad8
name: coredns.addons.k8s.io
selector:
k8s-addon: kube-dns.addons.k8s.io
version: 1.15.13-kops.3
- id: k8s-1.8
manifest: rbac.addons.k8s.io/k8s-1.8.yaml
manifestHash: a9ebd499f4d73dfa12cd6f0f762d3b143aecada6
name: rbac.addons.k8s.io
selector:
k8s-addon: rbac.addons.k8s.io
version: 1.8.0
k8s-addon: coredns.addons.k8s.io
version: 1.7.0-kops.3
- id: k8s-1.9
manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml
manifestHash: 1dbad74e01965afc2c32ca822d16c204d015db82
@ -54,33 +46,15 @@ spec:
k8s-addon: dns-controller.addons.k8s.io
version: 1.22.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: v1.7.0
kubernetesVersion: <1.15.0
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
manifestHash: 0a699ecad09b62fd94da8b97d1c2204c716c2b8f
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: k8s-1.12
kubernetesVersion: <1.16.0
manifest: networking.amazon-vpc-routed-eni/k8s-1.12.yaml
manifestHash: ae25f3b938e95a2649927d8b2047ed0e5f58539f
name: networking.amazon-vpc-routed-eni
selector:
role.kubernetes.io/networking: "1"
version: 1.5.5-kops.1
- id: k8s-1.16
kubernetesVersion: '>=1.16.0'
manifest: networking.amazon-vpc-routed-eni/k8s-1.16.yaml
manifestHash: 992ea59e207a3905600f7b9fbf99809093d6f964
manifestHash: ba5c98ae679d9feb8a84a063075acee4956cc126
name: networking.amazon-vpc-routed-eni
selector:
role.kubernetes.io/networking: "1"

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/networking.amazon-vpc-routed-eni-k8s-1.16.yaml
View File

@ -238,7 +238,7 @@ spec:
path: /etc/cni/net.d
name: cni-net-dir
- hostPath:
path: /var/run/dockershim.sock
path: /run/containerd/containerd.sock
name: dockershim
- hostPath:
path: /run/xtables.lock

10
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
View File

@ -5,7 +5,6 @@ metadata:
spec:
addons:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: e225462a29ef1cf9c6201f1375cd2511f7a1f665
name: kops-controller.addons.k8s.io
@ -47,21 +46,12 @@ spec:
k8s-addon: dns-controller.addons.k8s.io
version: 1.22.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: v1.7.0
kubernetesVersion: <1.15.0
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
manifestHash: 0a699ecad09b62fd94da8b97d1c2204c716c2b8f
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: k8s-1.18
kubernetesVersion: '>=1.18.0'
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml

10
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
View File

@ -5,7 +5,6 @@ metadata:
spec:
addons:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: e225462a29ef1cf9c6201f1375cd2511f7a1f665
name: kops-controller.addons.k8s.io
@ -47,21 +46,12 @@ spec:
k8s-addon: dns-controller.addons.k8s.io
version: 1.22.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: v1.7.0
kubernetesVersion: <1.15.0
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
manifestHash: 0a699ecad09b62fd94da8b97d1c2204c716c2b8f
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: k8s-1.12
manifest: authentication.aws/k8s-1.12.yaml
manifestHash: 685133bd71d677a5b299b5386eceffdbd3d60834

10
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View File

@ -5,7 +5,6 @@ metadata:
spec:
addons:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: d72db834feceb637342b58e910479e68f9071db2
name: kops-controller.addons.k8s.io
@ -54,21 +53,12 @@ spec:
k8s-addon: dns-controller.addons.k8s.io
version: 1.22.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: v1.7.0
kubernetesVersion: <1.15.0
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
manifestHash: 0a699ecad09b62fd94da8b97d1c2204c716c2b8f
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: k8s-1.12
manifest: networking.cilium.io/k8s-1.12-v1.9.yaml
manifestHash: 7de4d6e933cda022172f7e38ecf510c20a89c81a

10
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml
View File

@ -5,7 +5,6 @@ metadata:
spec:
addons:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: d72db834feceb637342b58e910479e68f9071db2
name: kops-controller.addons.k8s.io
@ -54,18 +53,9 @@ spec:
k8s-addon: dns-controller.addons.k8s.io
version: 1.22.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: v1.7.0
kubernetesVersion: <1.15.0
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
manifestHash: 0a699ecad09b62fd94da8b97d1c2204c716c2b8f
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0

10
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
View File

@ -5,7 +5,6 @@ metadata:
spec:
addons:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: e225462a29ef1cf9c6201f1375cd2511f7a1f665
name: kops-controller.addons.k8s.io
@ -47,18 +46,9 @@ spec:
k8s-addon: dns-controller.addons.k8s.io
version: 1.22.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: v1.7.0
kubernetesVersion: <1.15.0
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
manifestHash: 0a699ecad09b62fd94da8b97d1c2204c716c2b8f
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0

10
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View File

@ -5,7 +5,6 @@ metadata:
spec:
addons:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: e225462a29ef1cf9c6201f1375cd2511f7a1f665
name: kops-controller.addons.k8s.io
@ -47,21 +46,12 @@ spec:
k8s-addon: dns-controller.addons.k8s.io
version: 1.22.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
manifestHash: cc7393f22cb59dc4e23b9220ee962243334f47f1
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: v1.7.0
kubernetesVersion: <1.15.0
manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
manifestHash: 0a699ecad09b62fd94da8b97d1c2204c716c2b8f
name: storage-aws.addons.k8s.io
selector:
k8s-addon: storage-aws.addons.k8s.io
version: 1.17.0
- id: k8s-1.12
manifest: networking.weave/k8s-1.12.yaml
manifestHash: d9cfd0a062dad06e8f0828b92a744f46b1554a00