Skip to content

Commit

Permalink
Supporting Kops v1.10 (#6)
Browse files Browse the repository at this point in the history
* Starting support of kubernetes v1.10

* Starting support for kops-v1.10

* Remove missplaced comment

* ClusterSpec : Remove 'requireKubeconfig' (removed since kops-1.10 of kubernetes/kops#5621)
  • Loading branch information
mrmm authored and elafarge committed Mar 4, 2019
1 parent c37abdd commit a0b36ce
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions aws/cluster/templates/cluster-spec.yaml
Expand Up @@ -23,8 +23,8 @@ ${cloud-labels}
${etcd-clusters}
keyStore: s3://${kops-state-bucket}/${cluster-name}/pki
kubeAPIServer:
address: 127.0.0.1
admissionControl:
insecureBindAddress: 127.0.0.1
enableAdmissionPlugins:
- NamespaceLifecycle
- LimitRanger
- ServiceAccount
Expand Down Expand Up @@ -117,7 +117,6 @@ ${apiserver-runtime-config}
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: gcr.io/google_containers/pause-amd64:3.0
podManifestPath: /etc/kubernetes/manifests
requireKubeconfig: true
kubeReserved:
cpu: "${kube-reserved-cpu}"
memory: "${kube-reserved-memory}"
Expand Down Expand Up @@ -150,7 +149,6 @@ ${trusted-cidrs}
podInfraContainerImage: gcr.io/google_containers/pause-amd64:3.0
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
requireKubeconfig: true
masterPublicName: api.${cluster-name}
networkCIDR: ${vpc-cidr}
networkID: ${vpc-id}
Expand Down

0 comments on commit a0b36ce

Please sign in to comment.