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

fixing cf integration tests

This commit is contained in:
chrislovecnm 2017-10-03 12:34:08 -06:00
parent bda4e9f13e
commit 5ed0d471f6
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/integration/cloudformation/cloudformation.json.extracted.yaml
View File

@ -164,7 +164,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco
- http://127.0.0.1:4001 - http://127.0.0.1:4001
etcdServersOverrides: etcdServersOverrides:
- /events#http://127.0.0.1:4002 - /events#http://127.0.0.1:4002
image: gcr.io/google_containers/kube-apiserver:v1.4.6 image: gcr.io/google_containers/kube-apiserver:v1.4.12
insecurePort: 8080 insecurePort: 8080
logLevel: 2 logLevel: 2
securePort: 443 securePort: 443
@ -172,11 +172,12 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco
storageBackend: etcd2 storageBackend: etcd2
kubeControllerManager: kubeControllerManager:
allocateNodeCIDRs: true allocateNodeCIDRs: true
attachDetachReconcileSyncPeriod: 1m0s
cloudProvider: aws cloudProvider: aws
clusterCIDR: 100.96.0.0/11 clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com clusterName: minimal.example.com
configureCloudRoutes: true configureCloudRoutes: true
image: gcr.io/google_containers/kube-controller-manager:v1.4.6 image: gcr.io/google_containers/kube-controller-manager:v1.4.12
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
@ -186,10 +187,10 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco
cpuRequest: 100m cpuRequest: 100m
featureGates: null featureGates: null
hostnameOverride: '@aws' hostnameOverride: '@aws'
image: gcr.io/google_containers/kube-proxy:v1.4.6 image: gcr.io/google_containers/kube-proxy:v1.4.12
logLevel: 2 logLevel: 2
kubeScheduler: kubeScheduler:
image: gcr.io/google_containers/kube-scheduler:v1.4.6 image: gcr.io/google_containers/kube-scheduler:v1.4.12
leaderElection: leaderElection:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
@ -244,8 +245,8 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco
cat > kube_env.yaml << '__EOF_KUBE_ENV' cat > kube_env.yaml << '__EOF_KUBE_ENV'
Assets: Assets:
- 7d70e090951486cae52d9a82b7aaf5056f84f8ed@https://storage.googleapis.com/kubernetes-release/release/v1.4.6/bin/linux/amd64/kubelet - c4871c7315817ee114f5c554a58da8ebc54f08c3@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubelet
- 9adcd120fdb7ad6e64c061e56a05fefc12e9618b@https://storage.googleapis.com/kubernetes-release/release/v1.4.6/bin/linux/amd64/kubectl - d9fdb6b37597d371ef853cde76170f38a553aa78@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubectl
- 19d49f7b2b99cd2493d5ae0ace896c64e289ccbb@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz - 19d49f7b2b99cd2493d5ae0ace896c64e289ccbb@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz
- cbba856746a441c7d1a9e95e141c982a1b8864e6@https://kubeupv2.s3.amazonaws.com/kops/1.5.0/linux/amd64/utils.tar.gz - cbba856746a441c7d1a9e95e141c982a1b8864e6@https://kubeupv2.s3.amazonaws.com/kops/1.5.0/linux/amd64/utils.tar.gz
ClusterName: minimal.example.com ClusterName: minimal.example.com
@ -420,7 +421,7 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use
cpuRequest: 100m cpuRequest: 100m
featureGates: null featureGates: null
hostnameOverride: '@aws' hostnameOverride: '@aws'
image: gcr.io/google_containers/kube-proxy:v1.4.6 image: gcr.io/google_containers/kube-proxy:v1.4.12
logLevel: 2 logLevel: 2
kubelet: kubelet:
allowPrivileged: true allowPrivileged: true
@ -452,8 +453,8 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use
cat > kube_env.yaml << '__EOF_KUBE_ENV' cat > kube_env.yaml << '__EOF_KUBE_ENV'
Assets: Assets:
- 7d70e090951486cae52d9a82b7aaf5056f84f8ed@https://storage.googleapis.com/kubernetes-release/release/v1.4.6/bin/linux/amd64/kubelet - c4871c7315817ee114f5c554a58da8ebc54f08c3@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubelet
- 9adcd120fdb7ad6e64c061e56a05fefc12e9618b@https://storage.googleapis.com/kubernetes-release/release/v1.4.6/bin/linux/amd64/kubectl - d9fdb6b37597d371ef853cde76170f38a553aa78@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubectl
- 19d49f7b2b99cd2493d5ae0ace896c64e289ccbb@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz - 19d49f7b2b99cd2493d5ae0ace896c64e289ccbb@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz
- cbba856746a441c7d1a9e95e141c982a1b8864e6@https://kubeupv2.s3.amazonaws.com/kops/1.5.0/linux/amd64/utils.tar.gz - cbba856746a441c7d1a9e95e141c982a1b8864e6@https://kubeupv2.s3.amazonaws.com/kops/1.5.0/linux/amd64/utils.tar.gz
ClusterName: minimal.example.com ClusterName: minimal.example.com

2
tests/integration/cloudformation/in-v1alpha2.yaml
View File

@ -18,7 +18,7 @@ spec:
- instanceGroup: master-us-test-1a - instanceGroup: master-us-test-1a
name: us-test-1a name: us-test-1a
name: events name: events
kubernetesVersion: v1.4.6 kubernetesVersion: v1.4.12
masterInternalName: api.internal.minimal.example.com masterInternalName: api.internal.minimal.example.com
masterPublicName: api.minimal.example.com masterPublicName: api.minimal.example.com
networkCIDR: 172.20.0.0/16 networkCIDR: 172.20.0.0/16