Skip to content

WIP: Use the kubelet on RHCOS instead of from origin-node image #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
eparis wants to merge 1 commit into from
Closed

WIP: Use the kubelet on RHCOS instead of from origin-node image #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions config.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@ variable "tectonic_container_images" {
default = {
addon_resizer = "gcr.io/google_containers/addon-resizer:2.1"
bootkube = "quay.io/coreos/bootkube:v0.10.0"
tnc_operator = "quay.io/coreos/tectonic-node-controller-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
etcd_cert_signer = "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6"
etcd = "quay.io/coreos/etcd:v3.2.14"
hyperkube = "openshift/origin-node:latest"
kube_core_renderer = "quay.io/coreos/kube-core-renderer-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
kube_core_operator = "quay.io/coreos/kube-core-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
tectonic_channel_operator = "quay.io/coreos/tectonic-channel-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
kube_addon_operator = "quay.io/coreos/kube-addon-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
tectonic_alm_operator = "quay.io/coreos/tectonic-alm-operator:v0.3.1"
tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
tectonic_utility_operator = "quay.io/coreos/tectonic-utility-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
tectonic_network_operator = "quay.io/coreos/tectonic-network-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1"
tnc_operator = "quay.io/coreos/tectonic-node-controller-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
kube_core_renderer = "quay.io/coreos/kube-core-renderer-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
kube_core_operator = "quay.io/coreos/kube-core-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
tectonic_channel_operator = "quay.io/coreos/tectonic-channel-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
kube_addon_operator = "quay.io/coreos/kube-addon-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
tectonic_utility_operator = "quay.io/coreos/tectonic-utility-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
tectonic_network_operator = "quay.io/coreos/tectonic-network-operator-dev:b0e6febc1dfe4998f911c4ce2c911228a3fdcb38"
}
}

Expand Down
2 changes: 0 additions & 2 deletions modules/ignition/assets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ data "template_file" "kubelet" {
template = "${file("${path.module}/resources/services/kubelet.service")}"

vars {
kubelet_image_url = "${replace(var.container_images["hyperkube"],var.image_re,"$1")}"
kubelet_image_tag = "${replace(var.container_images["hyperkube"],var.image_re,"$2")}"
cloud_provider = "${var.cloud_provider}"
cloud_provider_config = "${var.cloud_provider_config != "" ? "--cloud-config=/etc/kubernetes/cloud/config" : ""}"
cluster_dns_ip = "${var.kube_dns_service_ip}"
Expand Down
23 changes: 1 addition & 22 deletions modules/ignition/resources/services/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,10 @@ After=docker.service kubelet-workaround.service

[Service]
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/checkpoint-secrets
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/cni/net.d
ExecStartPre=/bin/mkdir --parents /run/kubelet
ExecStartPre=/bin/mkdir --parents /var/lib/cni
ExecStartPre=/bin/mkdir --parents /var/lib/kubelet/pki

ExecStartPre=/usr/bin/bash -c "gawk '/certificate-authority-data/ {print $2}' /etc/kubernetes/kubeconfig | base64 --decode > /etc/kubernetes/ca.crt"

ExecStart=/usr/bin/docker \
run \
--rm \
--net host \
--pid host \
--privileged \
--volume /dev:/dev:rw \
--volume /sys:/sys:ro \
--volume /var/run:/var/run:rw \
--volume /var/lib/cni/:/var/lib/cni:rw \
--volume /var/lib/docker/:/var/lib/docker:rw \
--volume /var/lib/kubelet/:/var/lib/kubelet:shared \
--volume /var/log:/var/log:shared \
--volume /etc/kubernetes:/etc/kubernetes:ro \
--entrypoint /usr/bin/hyperkube \
"${kubelet_image_url}:${kubelet_image_tag}" \
ExecStart=/usr/bin/hyperkube \
kubelet \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--kubeconfig=/var/lib/kubelet/kubeconfig \
Expand Down