Upgrade deprecated k8s apiversion (microsoft#4132)

* Upgrade deprecated k8s apiversion Upgrade deprecated k8s apiversion "extensions/v1beta1" to "apps/v1". Reference: https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/ * Fix broken spec Fix broken daemon set spec.
sshyran · Jan 14, 2020 · 5bcb91a · 5bcb91a
1 parent f12510f
commit 5bcb91a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/src/device-plugin/config/device-plugin.yaml b/src/device-plugin/config/device-plugin.yaml
@@ -19,4 +19,3 @@ service_type: "k8s"
 
 devices:
   - "nvidia.com/gpu"
-  - "rdma/hca"
diff --git a/src/device-plugin/deploy/device-plugin.yaml b/src/device-plugin/deploy/device-plugin.yaml
@@ -18,12 +18,15 @@ data:
       ]
     }
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: k8s-host-device-plugin-daemonset
   namespace: kube-system
 spec:
+  selector:
+    matchLabels:
+      name: k8s-host-device-plugin-ds
   template:
     metadata:
       annotations:

diff --git a/src/device-plugin/deploy/start.sh.template b/src/device-plugin/deploy/start.sh.template
@@ -25,7 +25,7 @@ kubectl apply --overwrite=true -f device-plugin.yaml || exit $?
 # NVIDIA GPU device plugin
 {% if 'nvidia.com/gpu' in cluster_cfg['device-plugin']['devices'] %}
 
-kubectl apply --overwrite=true -f https://raw.githubusercontent.com/NVIDIA/k8s-device-plugin/1.0.0-beta/nvidia-device-plugin.yml || exit $?
+kubectl apply --overwrite=true -f https://raw.githubusercontent.com/NVIDIA/k8s-device-plugin/1.0.0-beta4/nvidia-device-plugin.yml || exit $?
 
 {% endif %}
 

diff --git a/src/fluentd/deploy/fluentd.yaml.template b/src/fluentd/deploy/fluentd.yaml.template
@@ -16,7 +16,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 kind: DaemonSet
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 metadata:
   name: fluentd-ds
 spec:

diff --git a/src/watchdog/test/data/no_condtion_pod.json b/src/watchdog/test/data/no_condtion_pod.json
@@ -18,7 +18,7 @@
                 },
                 "ownerReferences": [
                     {
-                        "apiVersion": "extensions/v1beta1",
+                        "apiVersion": "apps/v1",
                         "kind": "DaemonSet",
                         "name": "yarn-frameworklauncher-ds",
                         "uid": "b4918fda-8a77-11e8-a8fc-000d3ab25bb6",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,3 @@ service_type: "k8s"

		devices:
		- "nvidia.com/gpu"
		- "rdma/hca"