chery-pick changes from master

admission-webhook/webhook/base/kustomization.yaml

@@ -15,7 +15,7 @@ namePrefix: admission-webhook-
 images:
 - name: gcr.io/kubeflow-images-public/admission-webhook
   newName: gcr.io/kubeflow-images-public/admission-webhook
-  newTag: vmaster-gaf96e4e3
+  newTag: vmaster-ge5452b6f
 namespace: kubeflow
 configMapGenerator:
 - envs:

admission-webhook/webhook/overlays/application/application.yaml

@@ -8,23 +8,23 @@ spec:
       # TODO(jlewi): We should probably rename the app to PodDefaults
       # as that is what the admission controller is actually doing.
       # webhook is generic and uninformative.      
+      app.kubernetes.io/component: webhook
       app.kubernetes.io/name: webhook
-      app.kubernetes.io/instance: webhook-v1.0.0
-      app.kubernetes.io/managed-by: kfctl
-      app.kubernetes.io/component: bootstrap
-      app.kubernetes.io/part-of: webhook
-      app.kubernetes.io/version: v1.0.0
   componentKinds:
-  # Do not select any cluster scoped resources
-  # as that will cause problems.
   - group: core
     kind: ConfigMap
   - group: apps
-    kind: StatefulSet
+    kind: Deployment
+  - group: rbac.authorization.k8s.io
+    kind: Role
+  - group: rbac.authorization.k8s.io
+    kind: RoleBinding
   - group: core
     kind: Service
   - group: core
     kind: ServiceAccount
+  - group: apps
+    kind: StatefulSet
   descriptor:
     type: bootstrap
     version: v1beta1

common/centraldashboard/base/kustomization.yaml

@@ -17,7 +17,7 @@ commonLabels:
 images:
 - name: gcr.io/kubeflow-images-public/centraldashboard
   newName: gcr.io/kubeflow-images-public/centraldashboard
-  newTag: vmaster-gf39279c0
+  newTag: vmaster-g8097cfeb
 configMapGenerator:
 - envs:
   - params.env

common/centraldashboard/base_v3/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 images:
 - name: gcr.io/kubeflow-images-public/centraldashboard
   newName: gcr.io/kubeflow-images-public/centraldashboard
-  newTag: vmaster-gd601b2d0
+  newTag: vmaster-g8097cfeb
 resources:
 - ../base/clusterrole-binding.yaml
 - ../base/clusterrole.yaml

common/centraldashboard/overlays/application/application.yaml

@@ -5,25 +5,21 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: centraldashboard
-      app.kubernetes.io/instance: centraldashboard-v0.7.0
-      app.kubernetes.io/managed-by: kfctl
       app.kubernetes.io/component: centraldashboard
-      app.kubernetes.io/part-of: kubeflow
-      app.kubernetes.io/version: v0.7.0
+      app.kubernetes.io/name: centraldashboard
   componentKinds:
   - group: core
     kind: ConfigMap
   - group: apps
     kind: Deployment
-  - group: rbac.authorization.k8s.io
-    kind: RoleBinding
   - group: rbac.authorization.k8s.io
     kind: Role
-  - group: core
-    kind: ServiceAccount
+  - group: rbac.authorization.k8s.io
+    kind: RoleBinding
   - group: core
     kind: Service
+  - group: core
+    kind: ServiceAccount
   - group: networking.istio.io
     kind: VirtualService
   descriptor:

jupyter/jupyter-web-app/base/configs/spawner_ui_config.yaml

@@ -113,6 +113,8 @@ spawnerFormDefaults:
       vendors:
         - limitsKey: "nvidia.com/gpu"
           uiName: "NVIDIA"
+        - limitsKey: "amd.com/gpu"
+          uiName: "AMD"
       # Values: "" or a `limits-key` from the vendors list
       vendor: ""
     readOnly: false
@@ -125,4 +127,60 @@ spawnerFormDefaults:
     #   - add-gcp-secret
     #   - default-editor
     value: []
+    readOnly: false
+  affinityConfig:
+    # The default `configKey` from the options list
+    # If readonly, the default value will be the only option
+    value: "none"
+    # The list of available affinity configs
+    options:
+      - configKey: "none"
+        displayName: "None"
+        affinity: {}
+    # # (DESC) Pod gets an exclusive "n1-standard-2" Node
+    # # (TIP) set PreferNoSchedule taint on this node-pool
+    # # (TIP) enable cluster-autoscaler on this node-pool
+    # # (TIP) dont let users request more CPU/MEMORY than the size of this node
+    # - configKey: "exclusive__n1-standard-2"
+    #   displayName: "Exclusive: n1-standard-2"
+    #   affinity:
+    #     # (Require) Node having label: `node_pool=notebook-n1-standard-2`
+    #     nodeAffinity:
+    #       requiredDuringSchedulingIgnoredDuringExecution:
+    #         nodeSelectorTerms:
+    #           - matchExpressions:
+    #               - key: "node_pool"
+    #                 operator: "In"
+    #                 values:
+    #                   - "notebook-n1-standard-2"
+    #     # (Require) Node WITHOUT existing Pod having label: `notebook-name`
+    #     podAntiAffinity:
+    #       requiredDuringSchedulingIgnoredDuringExecution:
+    #         - labelSelector:
+    #             matchExpressions:
+    #               - key: "notebook-name"
+    #                 operator: "Exists"
+    #           namespaces: []
+    #           topologyKey: "kubernetes.io/hostname"
+    readOnly: false
+  tolerationGroup:
+    # The default `groupKey` from the options list
+    # If readonly, the default value will be the only option
+    value: "none"
+    # The list of available tolerationGroup configs
+    options:
+      - groupKey: "none"
+        displayName: "None"
+        tolerations: []
+    # - groupKey: "group_1"
+    #   displayName: "Group 1: description"
+    #   tolerations:
+    #     - key: "key1"
+    #       operator: "Equal"
+    #       value: "value1"
+    #       effect: "NoSchedule"
+    #     - key: "key2"
+    #       operator: "Equal"
+    #       value: "value2"
+    #       effect: "NoSchedule"
     readOnly: false

jupyter/jupyter-web-app/base_v3/kustomization.yaml

@@ -29,7 +29,7 @@ namespace: kubeflow
 images:
 - name: gcr.io/kubeflow-images-public/jupyter-web-app
   newName: gcr.io/kubeflow-images-public/jupyter-web-app
-  newTag: vmaster-gd9be4b9e
+  newTag: vmaster-g845af298
 resources:
 - ../base/cluster-role-binding.yaml
 - ../base/cluster-role.yaml

jupyter/jupyter-web-app/overlays/application/application.yaml

@@ -5,25 +5,21 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: jupyter-web-app
-      app.kubernetes.io/instance: jupyter-web-app-v0.7.0
-      app.kubernetes.io/managed-by: kfctl
       app.kubernetes.io/component: jupyter-web-app
-      app.kubernetes.io/part-of: kubeflow
-      app.kubernetes.io/version: v0.7.0
+      app.kubernetes.io/name: jupyter-web-app
   componentKinds:
   - group: core
     kind: ConfigMap
   - group: apps
     kind: Deployment
-  - group: rbac.authorization.k8s.io
-    kind: RoleBinding
   - group: rbac.authorization.k8s.io
     kind: Role
-  - group: core
-    kind: ServiceAccount
+  - group: rbac.authorization.k8s.io
+    kind: RoleBinding
   - group: core
     kind: Service
+  - group: core
+    kind: ServiceAccount
   - group: networking.istio.io
     kind: VirtualService
   descriptor:

jupyter/notebook-controller/base_v3/kustomization.yaml

@@ -12,7 +12,7 @@ configMapGenerator:
 images:
 - name: gcr.io/kubeflow-images-public/notebook-controller
   newName: gcr.io/kubeflow-images-public/notebook-controller
-  newTag: vmaster-gf39279c0
+  newTag: vmaster-g6eb007d0
 kind: Kustomization
 namePrefix: notebook-controller-
 namespace: kubeflow

jupyter/notebook-controller/overlays/application/application.yaml

@@ -5,19 +5,17 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: notebook-controller
-      app.kubernetes.io/instance: notebook-controller-v1.0.0
-      app.kubernetes.io/managed-by: kfctl
       app.kubernetes.io/component: notebook-controller
-      app.kubernetes.io/part-of: kubeflow
-      app.kubernetes.io/version: v1.0.0
+      app.kubernetes.io/name: notebook-controller
   componentKinds:
-    - group: core
-      kind: Service
-    - group: apps
-      kind: Deployment
-    - group: core
-      kind: ServiceAccount
+  - group: core
+    kind: ConfigMap
+  - group: apps
+    kind: Deployment
+  - group: core
+    kind: Service
+  - group: core
+    kind: ServiceAccount
   descriptor:
     type: notebook-controller
     version: v1beta1

profiles/base_v3/kustomization.yaml

@@ -6,10 +6,10 @@ commonLabels:
 images:
 - name: gcr.io/kubeflow-images-public/kfam
   newName: gcr.io/kubeflow-images-public/kfam
-  newTag: vmaster-gf3e09203
+  newTag: vmaster-g9f3bfd00
 - name: gcr.io/kubeflow-images-public/profile-controller
   newName: gcr.io/kubeflow-images-public/profile-controller
-  newTag: vmaster-g34aa47c2
+  newTag: vmaster-ga49f658f
 resources:
 - ../base/cluster-role-binding.yaml
 - ../base/crd.yaml

profiles/overlays/application/application.yaml

@@ -5,23 +5,17 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: profiles
-      app.kubernetes.io/instance: profiles-v1.0.0
-      app.kubernetes.io/managed-by: kfctl
       app.kubernetes.io/component: profiles
-      app.kubernetes.io/part-of: kubeflow
-      app.kubernetes.io/version: v1.0.0
+      app.kubernetes.io/name: profiles
   componentKinds:
-  # Do not select any cluster scoped resources
-  # as that will cause problems.
+  - group: core
+    kind: ConfigMap
   - group: apps
     kind: Deployment
-  - group: core
-    kind: ServiceAccount
   - group: core
     kind: Service
-  - group: kubeflow.org
-    kind: Profile
+  - group: core
+    kind: ServiceAccount
   descriptor:
     type: profiles
     version: v1

tests/stacks/aws/application/jupyter-web-app/test_data/expected/app.k8s.io_v1beta1_application_jupyter-web-app-jupyter-web-app.yaml

@@ -15,14 +15,14 @@ spec:
     kind: ConfigMap
   - group: apps
     kind: Deployment
-  - group: rbac.authorization.k8s.io
-    kind: RoleBinding
   - group: rbac.authorization.k8s.io
     kind: Role
-  - group: core
-    kind: ServiceAccount
+  - group: rbac.authorization.k8s.io
+    kind: RoleBinding
   - group: core
     kind: Service
+  - group: core
+    kind: ServiceAccount
   - group: networking.istio.io
     kind: VirtualService
   descriptor:
@@ -48,8 +48,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: jupyter-web-app
-      app.kubernetes.io/instance: jupyter-web-app-v0.7.0
-      app.kubernetes.io/managed-by: kfctl
       app.kubernetes.io/name: jupyter-web-app
-      app.kubernetes.io/part-of: kubeflow
-      app.kubernetes.io/version: v0.7.0

tests/stacks/aws/application/jupyter-web-app/test_data/expected/apps_v1_deployment_jupyter-web-app-deployment.yaml

@@ -32,7 +32,7 @@ spec:
             configMapKeyRef:
               key: userid-prefix
               name: kubeflow-config
-        image: gcr.io/kubeflow-images-public/jupyter-web-app:vmaster-gd9be4b9e
+        image: gcr.io/kubeflow-images-public/jupyter-web-app:vmaster-g845af298
         name: jupyter-web-app
         ports:
         - containerPort: 5000

tests/stacks/aws/test_data/expected/app.k8s.io_v1beta1_application_centraldashboard.yaml

@@ -13,14 +13,14 @@ spec:
     kind: ConfigMap
   - group: apps
     kind: Deployment
-  - group: rbac.authorization.k8s.io
-    kind: RoleBinding
   - group: rbac.authorization.k8s.io
     kind: Role
-  - group: core
-    kind: ServiceAccount
+  - group: rbac.authorization.k8s.io
+    kind: RoleBinding
   - group: core
     kind: Service
+  - group: core
+    kind: ServiceAccount
   - group: networking.istio.io
     kind: VirtualService
   descriptor:
@@ -50,8 +50,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: centraldashboard
-      app.kubernetes.io/instance: centraldashboard-v0.7.0
-      app.kubernetes.io/managed-by: kfctl
       app.kubernetes.io/name: centraldashboard
-      app.kubernetes.io/part-of: kubeflow
-      app.kubernetes.io/version: v0.7.0

tests/stacks/aws/test_data/expected/app.k8s.io_v1beta1_application_jupyter-web-app-jupyter-web-app.yaml

@@ -15,14 +15,14 @@ spec:
     kind: ConfigMap
   - group: apps
     kind: Deployment
-  - group: rbac.authorization.k8s.io
-    kind: RoleBinding
   - group: rbac.authorization.k8s.io
     kind: Role
-  - group: core
-    kind: ServiceAccount
+  - group: rbac.authorization.k8s.io
+    kind: RoleBinding
   - group: core
     kind: Service
+  - group: core
+    kind: ServiceAccount
   - group: networking.istio.io
     kind: VirtualService
   descriptor:
@@ -48,8 +48,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: jupyter-web-app
-      app.kubernetes.io/instance: jupyter-web-app-v0.7.0
-      app.kubernetes.io/managed-by: kfctl
       app.kubernetes.io/name: jupyter-web-app
-      app.kubernetes.io/part-of: kubeflow
-      app.kubernetes.io/version: v0.7.0

tests/stacks/aws/test_data/expected/app.k8s.io_v1beta1_application_notebook-controller-notebook-controller.yaml

@@ -12,9 +12,11 @@ spec:
   addOwnerRef: true
   componentKinds:
   - group: core
-    kind: Service
+    kind: ConfigMap
   - group: apps
     kind: Deployment
+  - group: core
+    kind: Service
   - group: core
     kind: ServiceAccount
   descriptor:
@@ -39,8 +41,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/component: notebook-controller
-      app.kubernetes.io/instance: notebook-controller-v1.0.0
-      app.kubernetes.io/managed-by: kfctl
       app.kubernetes.io/name: notebook-controller
-      app.kubernetes.io/part-of: kubeflow
-      app.kubernetes.io/version: v1.0.0