Merge pull request #1829 from vrutkovs/vsphere-nodeipfinder-podman

vsphere nodeip-configuration.service: run node-ip binary from container
openshift · Jun 18, 2020 · da05f8b · da05f8b
2 parents 5f887bb + 74c7e36
commit da05f8b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 490 deletions.
diff --git a/templates/common/vsphere/files/nodeip-finder.yaml b/templates/common/vsphere/files/nodeip-finder.yaml
diff --git a/templates/common/vsphere/files/vsphere-non-virtual-ip.yaml b/templates/common/vsphere/files/vsphere-non-virtual-ip.yaml
diff --git a/templates/common/vsphere/units/nodeip-configuration.service.yaml b/templates/common/vsphere/units/nodeip-configuration.service.yaml
@@ -18,7 +18,15 @@ contents: |
   [Service]
   # Need oneshot to delay kubelet
   Type=oneshot
-  ExecStart=/usr/local/bin/nodeip-finder --retry-on-failure {{.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP }}
+  ExecStart=/usr/bin/podman run --rm \
+    --authfile /var/lib/kubelet/config.json \
+    --net=host \
+    --volume /etc/systemd/system:/etc/systemd/system:z \
+    {{ .Images.baremetalRuntimeCfgImage }} \
+    node-ip \
+    set --retry-on-failure \
+    {{.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP }}
+  ExecStart=/bin/systemctl daemon-reload
 
   [Install]
   WantedBy=multi-user.target
@@ -27,4 +35,3 @@ contents: |
   {{ end -}}
   {{ end -}}
   {{ end -}}
-
diff --git a/templates/master/00-master/vsphere/files/NetworkManager-resolv-prepender.yaml b/templates/master/00-master/vsphere/files/NetworkManager-resolv-prepender.yaml
@@ -20,7 +20,12 @@ contents:
         # Ensure resolv.conf exists before we try to run podman
         cp /var/run/NetworkManager/resolv.conf /etc/resolv.conf
 
-        NAMESERVER_IP=$(/usr/local/bin/non_virtual_ip \
+        NAMESERVER_IP=$(/usr/bin/podman run --rm \
+            --authfile /var/lib/kubelet/config.json \
+            --net=host \
+            {{ .Images.baremetalRuntimeCfgImage }} \
+            node-ip \
+            show \
             "{{.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP}}" \
             "{{.Infra.Status.PlatformStatus.VSphere.IngressIP}}")
         DOMAIN="{{.EtcdDiscoveryDomain}}"