Skip to content
This repository was archived by the owner on Oct 31, 2019. It is now read-only.

Commit aa736e8

Browse files
jlamillanjlamillan
authored
Merge branch 'master' into jlamillan/private_cluster_support
2 parents a3fcbcd + cbd8a76 commit aa736e8

File tree

13 files changed

+116
-10
lines changed

13 files changed

+116
-10
lines changed

‎.github/ISSUE_TEMPLATE‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
### Terraform Version
2+
3+
<details>
4+
# Run this command to get the terraform version:
5+
6+
$ terraform -v
7+
8+
</details>
9+
10+
### OCI Provider Version
11+
12+
<details>
13+
# Execute the plugin directly to get the version:
14+
15+
$ \<path-to-plugin\>/terraform-provider-oci
16+
17+
</details>
18+
19+
### Terraform Installer for Kubernetes Version
20+
21+
<details>
22+
# The version/tag/release or commit hash (of this project) the issue occurred on
23+
</details>
24+
25+
### Input Variables
26+
27+
<details>
28+
# Values of non-sensitive input variables
29+
30+
</details>
31+
32+
### Description of issue:
33+

‎instances/k8smaster/scripts/cni-bridge.service‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ Before=docker.service
55
Type=oneshot
66
ExecStart=/usr/local/bin/cni-bridge.sh
77
RemainAfterExit=true
8+
[Install]
9+
WantedBy=multi-user.target

‎instances/k8smaster/scripts/flannel.service‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[Unit]
22
Description=flannel is an etcd backed network fabric for containers
33
Documentation=https://github.com/coreos/flannel
4+
After=docker.service kubelet.service
45

56
[Service]
67
Type=notify
@@ -11,7 +12,7 @@ ExecStart=/usr/local/bin/flanneld \
1112
-etcd-prefix /flannel/network
1213
Restart=always
1314
RestartSec=10
14-
After=docker.service kubelet.service
15+
1516

1617
[Install]
1718
WantedBy=multi-user.target

‎instances/k8smaster/scripts/kubelet.service‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ExecStart=/usr/bin/kubelet \
99
--pod-manifest-path=/etc/kubernetes/manifests \
1010
--hostname-override=__FQDN_HOSTNAME__ \
1111
--feature-gates=ExperimentalCriticalPodAnnotation=true \
12-
--v=2
12+
__SWAP_OPTION__ --v=2
1313
Restart=always
1414
RestartSec=10
15+
[Install]
16+
WantedBy=multi-user.target

‎instances/k8smaster/scripts/setup.template.sh‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,24 @@ export IP_LOCAL=$(ip route show to 0.0.0.0/0 | awk '{ print $5 }' | xargs ip add
1111

1212
SUBNET=$(getent hosts $IP_LOCAL | awk '{print $2}' | cut -d. -f2)
1313

14+
## k8s_ver swap option
15+
######################################
16+
k8sversion="${k8s_ver}"
17+
18+
if [[ $k8sversion =~ ^[0-1]+\.[0-7]+ ]]; then
19+
SWAP_OPTION=""
20+
else
21+
SWAP_OPTION="--fail-swap-on=false"
22+
fi
23+
24+
## k8s_ver RPM option
25+
######################################
26+
if [[ $k8sversion =~ ^[1]+\.[7]+\.[6-8] ]]; then
27+
RPM_TAG=1
28+
else
29+
RPM_TAG=0
30+
fi
31+
1432
## etcd
1533
######################################
1634

@@ -95,7 +113,7 @@ EOF
95113
## Install kubelet, kubectl, and kubernetes-cni
96114
###############################################
97115
yum-config-manager --add-repo http://yum.kubernetes.io/repos/kubernetes-el7-x86_64
98-
until yum install -y kubelet-${k8s_ver}-0 kubectl-${k8s_ver}-0 kubernetes-cni; do sleep 1 && echo -n ".";done
116+
until yum install -y kubelet-${k8s_ver}-$RPM_TAG kubectl-${k8s_ver}-$RPM_TAG kubernetes-cni; do sleep 1 && echo -n ".";done
99117

100118
# Pull etcd docker image from registry
101119
docker pull quay.io/coreos/etcd:${etcd_ver}
@@ -113,7 +131,9 @@ docker run -d \
113131

114132
## kubelet for the master
115133
systemctl daemon-reload
116-
sed -e "s/__FQDN_HOSTNAME__/$FQDN_HOSTNAME/g" /root/services/kubelet.service >/etc/systemd/system/kubelet.service
134+
sed -e "s/__FQDN_HOSTNAME__/$FQDN_HOSTNAME/g" \
135+
-e "s/__SWAP_OPTION__/$SWAP_OPTION/g" \
136+
/root/services/kubelet.service >/etc/systemd/system/kubelet.service
117137
systemctl daemon-reload
118138
systemctl enable kubelet
119139
systemctl start kubelet

‎instances/k8sworker/datasources.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ data "template_file" "setup-template" {
2323
docker_max_log_files = "${var.worker_docker_max_log_files}"
2424
etcd_discovery_url = "${file("${path.root}/generated/discovery${var.etcd_discovery_url}")}"
2525
etcd_endpoints = "${var.etcd_endpoints}"
26+
docker_device = "${var.docker_device}"
2627
}
2728
}
2829

@@ -73,8 +74,8 @@ data "template_file" "kubelet-service" {
7374
master_lb = "${var.master_lb}"
7475
k8s_ver = "${var.k8s_ver}"
7576
domain_name = "${var.domain_name}"
76-
region = "${lower(var.region)}"
77-
zone = "${lower(replace(var.availability_domain,":","-"))}"
77+
region = "${var.region}"
78+
zone = "${element(split(":",var.availability_domain),1)}"
7879
}
7980
}
8081

‎instances/k8sworker/scripts/cni-bridge.service‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ Before=docker.service
55
Type=oneshot
66
ExecStart=/usr/local/bin/cni-bridge.sh
77
RemainAfterExit=true
8+
[Install]
9+
WantedBy=multi-user.target

‎instances/k8sworker/scripts/flannel.service‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[Unit]
22
Description=flannel is an etcd backed network fabric for containers
33
Documentation=https://github.com/coreos/flannel
4+
After=docker.service kubelet.service
45

56
[Service]
67
Type=notify
@@ -11,7 +12,7 @@ ExecStart=/usr/local/bin/flanneld \
1112
-etcd-prefix /flannel/network
1213
Restart=always
1314
RestartSec=10
14-
After=docker.service kubelet.service
15+
1516

1617
[Install]
1718
WantedBy=multi-user.target

‎instances/k8sworker/scripts/kubelet.service‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ ExecStart=/usr/bin/kubelet \
2020
--tls-cert-file=/etc/kubernetes/ssl/apiserver.pem \
2121
--tls-private-key-file=/etc/kubernetes/ssl/apiserver-key.pem \
2222
--feature-gates=ExperimentalCriticalPodAnnotation=true \
23-
--v=2
23+
__SWAP_OPTION__ --v=2
2424
Restart=always
2525
RestartSec=10
26+
[Install]
27+
WantedBy=multi-user.target

‎instances/k8sworker/scripts/setup.template.sh‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,24 @@ export IP_LOCAL=$(ip route show to 0.0.0.0/0 | awk '{ print $5 }' | xargs ip add
1919
SUBNET=$(getent hosts $IP_LOCAL | awk '{print $2}' | cut -d. -f2)
2020
export WORKER_IP=$IP_LOCAL
2121

22+
## k8s_ver swap option
23+
######################################
24+
k8sversion="${k8s_ver}"
25+
26+
if [[ $k8sversion =~ ^[0-1]+\.[0-7]+ ]]; then
27+
SWAP_OPTION=""
28+
else
29+
SWAP_OPTION="--fail-swap-on=false"
30+
fi
31+
32+
## k8s_ver RPM Tag option
33+
######################################
34+
if [[ $k8sversion =~ ^[1]+\.[7]+\.[6-8] ]]; then
35+
RPM_TAG=1
36+
else
37+
RPM_TAG=0
38+
fi
39+
2240
## etcd
2341
######################################
2442

@@ -49,6 +67,17 @@ systemctl enable cni-bridge && systemctl start cni-bridge
4967

5068
## Docker
5169
######################################
70+
if [ -n "${docker_device}" ]; then
71+
if [ -e "${docker_device}" ]; then
72+
mkfs -t xfs -L DOCKER ${docker_device}
73+
mkdir -p /var/lib/docker
74+
cat <<-EOF >>/etc/fstab
75+
LABEL=DOCKER /var/lib/docker xfs defaults 0 0
76+
EOF
77+
mount /var/lib/docker
78+
fi
79+
fi
80+
5281
until yum -y install docker-engine-${docker_ver}; do sleep 1 && echo -n "."; done
5382

5483
cat <<EOF > /etc/sysconfig/docker-network
@@ -107,7 +136,7 @@ EOF
107136
## Install kubelet, kubectl, and kubernetes-cni
108137
###############################################
109138
yum-config-manager --add-repo http://yum.kubernetes.io/repos/kubernetes-el7-x86_64
110-
until yum install -y kubelet-${k8s_ver}-0 kubectl-${k8s_ver}-0 kubernetes-cni; do sleep 1 && echo -n ".";done
139+
until yum install -y kubelet-${k8s_ver}-$RPM_TAG kubectl-${k8s_ver}-$RPM_TAG kubernetes-cni; do sleep 1 && echo -n ".";done
111140

112141
## Pull etcd docker image from registry
113142
docker pull quay.io/coreos/etcd:${etcd_ver}
@@ -145,6 +174,7 @@ sed -e "s/__FQDN_HOSTNAME__/$FQDN_HOSTNAME/g" \
145174
-e "s/__NODE_ID_PREFIX__/$NODE_ID_0/g" \
146175
-e "s/__NODE_ID_SUFFIX__/$NODE_ID_1/g" \
147176
-e "s/__NODE_SHAPE__/$NODE_SHAPE/g" \
177+
-e "s/__SWAP_OPTION__/$SWAP_OPTION/g" \
148178
/root/services/kubelet.service > /etc/systemd/system/kubelet.service
149179

150180
## Wait for k8s master to be available. There is a possible race on pod networks otherwise.

0 commit comments

Comments
 (0)