Skip to content

Commit

Permalink
Merge pull request #12 from utilitywarehouse/kube-1.8
Browse files Browse the repository at this point in the history
changes for kubernetes 1.8
  • Loading branch information
alkar authored Oct 19, 2017
2 parents b84d5b6 + a5542c6 commit b79ccdd
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
9 changes: 9 additions & 0 deletions master.tf
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,15 @@ data "template_file" "kube-apiserver" {
cloud_provider = "${var.cloud_provider}"
oidc_issuer_url = "${var.oidc_issuer_url}"
oidc_client_id = "${var.oidc_client_id}"

/*
* for the list of APIs & resources enabled by default, please see near the
* bottom of the file:
* https://github.com/kubernetes/kubernetes/blob/<ref>/pkg/master/master.go
*
*/

runtime_config = "${join(",", list())}"
}
}

Expand Down
2 changes: 1 addition & 1 deletion resources/kube-apiserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
- --client-ca-file=/etc/kubernetes/ssl/ca.pem
- --service-account-key-file=/etc/kubernetes/ssl/signing-key.pem
- --service-account-lookup=true
- --runtime-config=extensions/v1beta1=true,extensions/v1beta1/deployments=true,extensions/v1beta1/daemonsets=true,extensions/v1beta1/networkpolicies=true,extensions/v1beta1/thirdpartyresources=true,rbac.authorization.k8s.io/v1beta1=true,batch/v2alpha1=true
${runtime_config == "" ? "" : "- --runtime-config=${runtime_config}"}
${cloud_provider == "" ? "" : "- --cloud-provider=${cloud_provider}"}
- --oidc-issuer-url=${oidc_issuer_url}
- --oidc-username-claim=email
Expand Down
1 change: 0 additions & 1 deletion resources/master-kubelet.service
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ ExecStartPre=-/bin/sh -c "docker restart $(docker ps --no-trunc | grep '/hyperku
ExecStartPre=-/bin/sh -c "docker restart $(docker ps --no-trunc | grep '/hyperkube apiserver' | awk '{ print $1; }')"
ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
ExecStart=/usr/lib/coreos/kubelet-wrapper \
--require-kubeconfig=true \
--kubeconfig=/var/lib/kubelet/kubeconfig \
--node-labels=role=master \
--register-node=true \
Expand Down
1 change: 0 additions & 1 deletion resources/worker-kubelet.service
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ ExecStartPre=/opt/bin/cfssl-new-cert
ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid
ExecStart=/usr/lib/coreos/kubelet-wrapper \
--kubeconfig=/var/lib/kubelet/kubeconfig \
--require-kubeconfig=true \
--node-labels=role=${role} \
--container-runtime=docker \
--network-plugin=cni \
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ variable "hyperkube_image_url" {

variable "hyperkube_image_tag" {
description = "The version of the hyperkube image to use."
default = "v1.7.6_coreos.0"
default = "v1.8.1_coreos.0"
}

variable "cluster_dns" {
Expand Down

0 comments on commit b79ccdd

Please sign in to comment.