K8s 1.9 API bump: image-puller

jupyterhub · Sep 8, 2018 · 9239472 · 9239472
1 parent 1d835e9
commit 9239472
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/images/image-awaiter/Dockerfile b/images/image-awaiter/Dockerfile
@@ -19,8 +19,8 @@ COPY --from=0 /go/image-awaiter /image-awaiter
 # > kubectl proxy --port=8080
 
 # 2. Try the API using the proxy...
-# > curl http://localhost:8080/apis/apps/v1beta2/namespaces/<namespace>/demonsets/hook-image-puller
+# > curl http://localhost:8080/apis/apps/v1/namespaces/<namespace>/demonsets/hook-image-puller
 
 # 3. Try the container using the proxy...
 # > docker build --tag <name:tag> .
-# > docker run -it --rm --net=host <name:tag> /image-awaiter -debug -namespace <namespace> -daemonset hook-image-puller
+# > docker run -it --rm --net=host <name:tag> /image-awaiter -debug -namespace <namespace> -daemonset hook-image-puller
diff --git a/images/image-awaiter/daemonset.go b/images/image-awaiter/daemonset.go
@@ -21,7 +21,7 @@ type DaemonSet struct {
 // Return a *DaemonSet and the relevant state its in
 func getDaemonSet(transportPtr *http.Transport, server string, headers map[string]string, namespace string, daemonSet string) (*DaemonSet, error) {
 	client := &http.Client{Transport: transportPtr}
-	url := server + "/apis/apps/v1beta2/namespaces/" + namespace + "/daemonsets/" + daemonSet
+	url := server + "/apis/apps/v1/namespaces/" + namespace + "/daemonsets/" + daemonSet
 
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {

diff --git a/images/image-awaiter/main.go b/images/image-awaiter/main.go
@@ -4,7 +4,7 @@
 // started when this job starts. When all images are pulled, this job exits.
 
 /*
-K8s API options - currently using 1.8
+K8s API options - currently using 1.9
 - K8s 1.8 API: curl http://localhost:8080/apis/apps/v1beta2/namespaces/<ns>/demonsets/<ds>
 - K8s 1.9 API: curl http://localhost:8080/apis/apps/v1/namespaces/<ns>/demonsets/<ds>
 */

diff --git a/jupyterhub/templates/image-puller/_daemonset-helper.yaml b/jupyterhub/templates/image-puller/_daemonset-helper.yaml
@@ -4,7 +4,7 @@ Returns an image-puller daemonset. Two daemonsets will be created like this.
 - continuous-image-puller: for newly added nodes image pulling
 */}}
 {{- define "jupyterhub.imagePuller.daemonset" -}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ print .componentPrefix "image-puller" }}

diff --git a/jupyterhub/templates/image-puller/rbac.yaml b/jupyterhub/templates/image-puller/rbac.yaml
@@ -22,7 +22,7 @@ metadata:
 ... will be used by this role...
 */}}
 kind: Role
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: hook-image-awaiter
   labels:
@@ -41,7 +41,7 @@ rules:
 ... as declared by this binding.
 */}}
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: hook-image-awaiter
   labels: