Skip to content

Commit 706f4c0

Browse files
authored
Merge pull request #21 from projectsyn/ocp-1003/harden-sudo
When impersonating the cluster admin, use system:admin instead of cluster-admin
2 parents 27da0f2 + 760bfa3 commit 706f4c0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

docs/modules/ROOT/pages/how-tos/deploy-ocp.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ spec:
5757
[source,bash]
5858
----
5959
for n in $(kubectl get nodes -oname); do
60-
PROVIDERID=$(oc -n syn-debug-nodes --as=cluster-admin debug $n -- chroot /host cat /etc/systemd/system/kubelet.service.d/20-appuio-providerid.conf 2>&1 | grep PROVIDERID | sed -e 's/^Environment="KUBELET_PROVIDERID=\([^"]\+\)"$/\1/g')
61-
echo kubectl --as=cluster-admin patch $n --type=merge -p "{\"spec\":{\"providerID\":\"${PROVIDERID}\"}}";
60+
PROVIDERID=$(oc -n syn-debug-nodes --as=system:admin debug $n -- chroot /host cat /etc/systemd/system/kubelet.service.d/20-appuio-providerid.conf 2>&1 | grep PROVIDERID | sed -e 's/^Environment="KUBELET_PROVIDERID=\([^"]\+\)"$/\1/g')
61+
echo kubectl --as=system:admin patch $n --type=merge -p "{\"spec\":{\"providerID\":\"${PROVIDERID}\"}}";
6262
done
6363
----
6464

@@ -67,8 +67,8 @@ done
6767
[source,bash]
6868
----
6969
for n in $(kubectl get nodes -oname); do
70-
PROVIDERID=$(oc -n syn-debug-nodes --as=cluster-admin debug $n -- chroot /host cat /etc/systemd/system/kubelet.service.d/20-appuio-providerid.conf 2>&1 | grep PROVIDERID | sed -e 's/^Environment="KUBELET_PROVIDERID=\([^"]\+\)"$/\1/g')
71-
kubectl --as=cluster-admin patch $n --type=merge -p "{\"spec\":{\"providerID\":\"${PROVIDERID}\"}}";
70+
PROVIDERID=$(oc -n syn-debug-nodes --as=system:admin debug $n -- chroot /host cat /etc/systemd/system/kubelet.service.d/20-appuio-providerid.conf 2>&1 | grep PROVIDERID | sed -e 's/^Environment="KUBELET_PROVIDERID=\([^"]\+\)"$/\1/g')
71+
kubectl --as=system:admin patch $n --type=merge -p "{\"spec\":{\"providerID\":\"${PROVIDERID}\"}}";
7272
done
7373
kubectl get no -ocustom-columns='NAME:.metadata.name,PROVIDER_ID:.spec.providerID'
7474
----
@@ -99,7 +99,7 @@ IMPORTANT: This step triggers node reboots to apply the Kubelet flag `--cloud-pr
9999
+
100100
[source,bash]
101101
----
102-
kubectl --as cluster-admin patch infrastructure.config cluster --type=merge -p '{"spec":{"platformSpec":{"external":{"platformName":"cloudscale.ch"},"type":"External"}}}'
102+
kubectl --as=system:admin patch infrastructure.config cluster --type=merge -p '{"spec":{"platformSpec":{"external":{"platformName":"cloudscale.ch"},"type":"External"}}}'
103103
infrastructure.config.openshift.io/cluster patched
104104
----
105105
+
@@ -113,7 +113,7 @@ curl -XPATCH -H"Content-Type: application/merge-patch+json" http://localhost:800
113113
+
114114
[source,bash]
115115
----
116-
kubectl --as cluster-admin taint node --all node.cloudprovider.kubernetes.io/uninitialized=true:NoSchedule
116+
kubectl --as=system:admin taint node --all node.cloudprovider.kubernetes.io/uninitialized=true:NoSchedule
117117
----
118118

119119
. Check if instance-type is applied

0 commit comments

Comments
 (0)