Skip to content

WIP: templates: Add node.openshift.io/rhelmajor label, drop os_version one #584

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
cgwalters wants to merge 2 commits into from
Closed

WIP: templates: Add node.openshift.io/rhelmajor label, drop os_version one #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2cce0e
templates: Add node.openshift.io/rhelmajor label, drop os_version one
cgwalters Mar 26, 2019
a914f1b
tests: Update generated test data
cgwalters Mar 26, 2019
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: 16 additions & 0 deletions ...template/test_data/templates/master/01-master-kubelet/aws/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
3 changes: 2 additions & 1 deletion ...ontroller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ contents: |
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
EnvironmentFile=/etc/os-release
EnvironmentFile=/run/kubelet-rhelmajor
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

Expand All @@ -20,7 +21,7 @@ contents: |
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--allow-privileged \
--node-labels=node-role.kubernetes.io/master,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
--node-labels=node-role.kubernetes.io/master,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
--minimum-container-ttl-duration=6m0s \
--client-ca-file=/etc/kubernetes/ca.crt \
--cloud-provider=aws \
Expand Down
16 changes: 16 additions & 0 deletions ...late/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
3 changes: 2 additions & 1 deletion ...oller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ contents: |
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
EnvironmentFile=/etc/os-release
EnvironmentFile=/run/kubelet-rhelmajor
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

Expand All @@ -20,7 +21,7 @@ contents: |
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--allow-privileged \
--node-labels=node-role.kubernetes.io/master,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
--node-labels=node-role.kubernetes.io/master,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
--minimum-container-ttl-duration=6m0s \
--client-ca-file=/etc/kubernetes/ca.crt \
--cloud-provider= \
Expand Down
16 changes: 16 additions & 0 deletions ...emplate/test_data/templates/master/01-master-kubelet/none/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
3 changes: 2 additions & 1 deletion ...ntroller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ contents: |
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
EnvironmentFile=/etc/os-release
EnvironmentFile=/run/kubelet-rhelmajor
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

Expand All @@ -20,7 +21,7 @@ contents: |
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--allow-privileged \
--node-labels=node-role.kubernetes.io/master,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
--node-labels=node-role.kubernetes.io/master,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
--minimum-container-ttl-duration=6m0s \
--client-ca-file=/etc/kubernetes/ca.crt \
--cloud-provider= \
Expand Down
16 changes: 16 additions & 0 deletions ...te/test_data/templates/master/01-master-kubelet/openstack/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
16 changes: 16 additions & 0 deletions ...late/test_data/templates/master/01-master-kubelet/vpshere/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
16 changes: 16 additions & 0 deletions ...late/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
3 changes: 2 additions & 1 deletion ...oller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ contents: |
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
EnvironmentFile=/etc/os-release
EnvironmentFile=/run/kubelet-rhelmajor
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

Expand All @@ -20,7 +21,7 @@ contents: |
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--allow-privileged \
--node-labels=node-role.kubernetes.io/master,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
--node-labels=node-role.kubernetes.io/master,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
--minimum-container-ttl-duration=6m0s \
--client-ca-file=/etc/kubernetes/ca.crt \
--cloud-provider=vsphere \
Expand Down
16 changes: 16 additions & 0 deletions ...template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
3 changes: 2 additions & 1 deletion ...ontroller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ contents: |
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
EnvironmentFile=/etc/os-release
EnvironmentFile=/run/kubelet-rhelmajor
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

Expand All @@ -19,7 +20,7 @@ contents: |
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--allow-privileged \
--node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
--node-labels=node-role.kubernetes.io/worker,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
--minimum-container-ttl-duration=6m0s \
--volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
--client-ca-file=/etc/kubernetes/ca.crt \
Expand Down
16 changes: 16 additions & 0 deletions ...late/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
3 changes: 2 additions & 1 deletion ...oller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ contents: |
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
EnvironmentFile=/etc/os-release
EnvironmentFile=/run/kubelet-rhelmajor
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

Expand All @@ -19,7 +20,7 @@ contents: |
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--allow-privileged \
--node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
--node-labels=node-role.kubernetes.io/worker,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
--minimum-container-ttl-duration=6m0s \
--volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
--client-ca-file=/etc/kubernetes/ca.crt \
Expand Down
16 changes: 16 additions & 0 deletions ...emplate/test_data/templates/worker/01-worker-kubelet/none/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
3 changes: 2 additions & 1 deletion ...ntroller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ contents: |
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
EnvironmentFile=/etc/os-release
EnvironmentFile=/run/kubelet-rhelmajor
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

Expand All @@ -19,7 +20,7 @@ contents: |
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--allow-privileged \
--node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
--node-labels=node-role.kubernetes.io/worker,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
--minimum-container-ttl-duration=6m0s \
--volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
--client-ca-file=/etc/kubernetes/ca.crt \
Expand Down
16 changes: 16 additions & 0 deletions ...te/test_data/templates/worker/01-worker-kubelet/openstack/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
16 changes: 16 additions & 0 deletions ...late/test_data/templates/worker/01-worker-kubelet/vpshere/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
16 changes: 16 additions & 0 deletions ...late/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet-rhelmajor.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
enabled: true
name: kubelet-rhelmajor.service
3 changes: 2 additions & 1 deletion ...oller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ contents: |
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
EnvironmentFile=/etc/os-release
EnvironmentFile=/run/kubelet-rhelmajor
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

Expand All @@ -19,7 +20,7 @@ contents: |
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--allow-privileged \
--node-labels=node-role.kubernetes.io/worker,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
--node-labels=node-role.kubernetes.io/worker,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
--minimum-container-ttl-duration=6m0s \
--volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
--client-ca-file=/etc/kubernetes/ca.crt \
Expand Down
16 changes: 16 additions & 0 deletions templates/master/01-master-kubelet/_base/units/kubelet-rhelmajor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "kubelet-rhelmajor.service"
enabled: true
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
3 changes: 2 additions & 1 deletion templates/master/01-master-kubelet/_base/units/kubelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ contents: |
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
ExecStartPre=/bin/rm -f /var/lib/kubelet/cpu_manager_state
EnvironmentFile=/etc/os-release
EnvironmentFile=/run/kubelet-rhelmajor
EnvironmentFile=-/etc/kubernetes/kubelet-workaround
EnvironmentFile=-/etc/kubernetes/kubelet-env

Expand All @@ -22,7 +23,7 @@ contents: |
--container-runtime=remote \
--container-runtime-endpoint=/var/run/crio/crio.sock \
--allow-privileged \
--node-labels=node-role.kubernetes.io/master,node.openshift.io/os_version=${VERSION_ID},node.openshift.io/os_id=${ID} \
--node-labels=node-role.kubernetes.io/master,node.openshift.io/rhelmajor=${RHELMAJOR},node.openshift.io/os_id=${ID} \
--minimum-container-ttl-duration=6m0s \
--client-ca-file=/etc/kubernetes/ca.crt \
--cloud-provider={{cloudProvider .}} \
Expand Down
16 changes: 16 additions & 0 deletions templates/worker/01-worker-kubelet/_base/units/kubelet-rhelmajor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "kubelet-rhelmajor.service"
enabled: true
contents: |
[Unit]
Description=Generate rhelmajor version for kubelet
Before=kubelet.service

[Service]
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/os-release
# Really we should fix VERSION_ID in rhcos but that requires rpm-ostree changes
ExecStart=/bin/sh -c '(echo -n RHELMAJOR= && if [ "${ID}" = rhcos ]; then echo ${VERSION} | cut -d . -f 2; else echo ${VERSION_ID} | cut -d . -f 1; fi) > /run/kubelet-rhelmajor'

[Install]
WantedBy=multi-user.target
Loading