Update kubeflow/kubeflow manifests from v1.6.0-rc.2 (kubeflow#2278)

Signed-off-by: Anna Jung (VMware) <[email protected]> Signed-off-by: Anna Jung (VMware) <[email protected]> (cherry picked from commit 35eda37) Update kubeflow/training-operator manifests from v1.5.0 (kubeflow#2272) (cherry picked from commit c89471f) Update kubeflow/kubeflow manifests from v1.6.0-rc.3 (kubeflow#2279) Signed-off-by: Anna Jung (VMware) <[email protected]> Signed-off-by: Anna Jung (VMware) <[email protected]> (cherry picked from commit 5ee3302)
opendatahub-io · Sep 2, 2022 · 777a555 · 777a555
1 parent 35d45bb
commit 777a555
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -41,15 +41,15 @@ This repo periodically syncs all official Kubeflow components from their respect
 
 | Component | Local Manifests Path | Upstream Revision |
 | - | - | - |
-| Training Operator | apps/training-operator/upstream | [v1.5.0-rc.0](https://github.com/kubeflow/training-operator/tree/v1.5.0-rc.0/manifests) |
-| Notebook Controller | apps/jupyter/notebook-controller/upstream | [v1.6.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.1/components/notebook-controller/config) |
-| Tensorboard Controller | apps/tensorboard/tensorboard-controller/upstream | [v1.6.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.1/components/tensorboard-controller/config) |
-| Central Dashboard | apps/centraldashboard/upstream | [v1.6.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.1/components/centraldashboard/manifests) |
-| Profiles + KFAM | apps/profiles/upstream | [v1.6.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.1/components/profile-controller/config) |
-| PodDefaults Webhook | apps/admission-webhook/upstream | [v1.6.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.1/components/admission-webhook/manifests) |
-| Jupyter Web App | apps/jupyter/jupyter-web-app/upstream | [v1.6.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.1/components/crud-web-apps/jupyter/manifests) |
-| Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.6.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.1/components/crud-web-apps/tensorboards/manifests) |
-| Volumes Web App | apps/volumes-web-app/upstream | [v1.6.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.1/components/crud-web-apps/volumes/manifests) |
+| Training Operator | apps/training-operator/upstream | [v1.5.0](https://github.com/kubeflow/training-operator/tree/v1.5.0/manifests) |
+| Notebook Controller | apps/jupyter/notebook-controller/upstream | [v1.6.0-rc.3](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.3/components/notebook-controller/config) |
+| Tensorboard Controller | apps/tensorboard/tensorboard-controller/upstream | [v1.6.0-rc.3](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.3/components/tensorboard-controller/config) |
+| Central Dashboard | apps/centraldashboard/upstream | [v1.6.0-rc.3](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.3/components/centraldashboard/manifests) |
+| Profiles + KFAM | apps/profiles/upstream | [v1.6.0-rc.3](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.3/components/profile-controller/config) |
+| PodDefaults Webhook | apps/admission-webhook/upstream | [v1.6.0-rc.3](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.3/components/admission-webhook/manifests) |
+| Jupyter Web App | apps/jupyter/jupyter-web-app/upstream | [v1.6.0-rc.3](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.3/components/crud-web-apps/jupyter/manifests) |
+| Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.6.0-rc.3](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.3/components/crud-web-apps/tensorboards/manifests) |
+| Volumes Web App | apps/volumes-web-app/upstream | [v1.6.0-rc.3](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.3/components/crud-web-apps/volumes/manifests) |
 | Katib | apps/katib/upstream | [v0.14.0-rc.0](https://github.com/kubeflow/katib/tree/v0.14.0-rc.0/manifests/v1beta1) |
 | KServe | contrib/kserve/kserve | [release-0.8](https://github.com/kserve/kserve/tree/8079f375cbcedc4d45a1b4aade2e2308ea6f9ae8/install/v0.8.0) |
 | KServe Models Web App | contrib/kserve/models-web-app | [v0.8.1](https://github.com/kserve/models-web-app/tree/v0.8.1/config) |

diff --git a/apps/admission-webhook/upstream/base/kustomization.yaml b/apps/admission-webhook/upstream/base/kustomization.yaml
@@ -15,7 +15,7 @@ commonLabels:
   app.kubernetes.io/name: poddefaults
 images:
 - name: docker.io/kubeflownotebookswg/poddefaults-webhook
-  newTag: v1.6.0-rc.1
+  newTag: v1.6.0-rc.2
 namespace: kubeflow
 generatorOptions:
   disableNameSuffixHash: true

diff --git a/apps/centraldashboard/upstream/base/kustomization.yaml b/apps/centraldashboard/upstream/base/kustomization.yaml
@@ -17,7 +17,7 @@ commonLabels:
   app.kubernetes.io/name: centraldashboard
 images:
 - name: docker.io/kubeflownotebookswg/centraldashboard
-  newTag: v1.6.0-rc.1
+  newTag: v1.6.0-rc.2
 configMapGenerator:
 - envs:
   - params.env

diff --git a/apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml b/apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml
@@ -17,23 +17,23 @@
 spawnerFormDefaults:
   image:
     # The container Image for the user's Jupyter Notebook
-    value: kubeflownotebookswg/jupyter-scipy:v1.6.0-rc.1
+    value: kubeflownotebookswg/jupyter-scipy:v1.6.0-rc.2
     # The list of available standard container Images
     options:
-    - kubeflownotebookswg/jupyter-scipy:v1.6.0-rc.1
-    - kubeflownotebookswg/jupyter-pytorch-full:v1.6.0-rc.1
-    - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.6.0-rc.1
-    - kubeflownotebookswg/jupyter-tensorflow-full:v1.6.0-rc.1
-    - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.6.0-rc.1
+    - kubeflownotebookswg/jupyter-scipy:v1.6.0-rc.2
+    - kubeflownotebookswg/jupyter-pytorch-full:v1.6.0-rc.2
+    - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.6.0-rc.2
+    - kubeflownotebookswg/jupyter-tensorflow-full:v1.6.0-rc.2
+    - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.6.0-rc.2
   imageGroupOne:
     # The container Image for the user's Group One Server
     # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
     # is applied to notebook in this group, configuring
     # the Istio rewrite for containers that host their web UI at `/`
-    value: kubeflownotebookswg/codeserver-python:v1.6.0-rc.1
+    value: kubeflownotebookswg/codeserver-python:v1.6.0-rc.2
     # The list of available standard container Images
     options:
-    - kubeflownotebookswg/codeserver-python:v1.6.0-rc.1
+    - kubeflownotebookswg/codeserver-python:v1.6.0-rc.2
   imageGroupTwo:
     # The container Image for the user's Group Two Server
     # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
@@ -42,10 +42,10 @@ spawnerFormDefaults:
     # The annotation `notebooks.kubeflow.org/http-headers-request-set`
     # is applied to notebook in this group, configuring Istio
     # to add the `X-RStudio-Root-Path` header to requests
-    value: kubeflownotebookswg/rstudio-tidyverse:v1.6.0-rc.1
+    value: kubeflownotebookswg/rstudio-tidyverse:v1.6.0-rc.2
     # The list of available standard container Images
     options:
-    - kubeflownotebookswg/rstudio-tidyverse:v1.6.0-rc.1
+    - kubeflownotebookswg/rstudio-tidyverse:v1.6.0-rc.2
   # If true, hide registry and/or tag name in the image selection dropdown
   hideRegistry: true
   hideTag: false

diff --git a/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml b/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml
@@ -22,7 +22,7 @@ commonLabels:
   kustomize.component: jupyter-web-app
 images:
 - name: docker.io/kubeflownotebookswg/jupyter-web-app
-  newTag: v1.6.0-rc.1
+  newTag: v1.6.0-rc.2
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:

diff --git a/apps/jupyter/notebook-controller/upstream/base/kustomization.yaml b/apps/jupyter/notebook-controller/upstream/base/kustomization.yaml
@@ -4,4 +4,4 @@ resources:
 - ../default
 images:
 - name: docker.io/kubeflownotebookswg/notebook-controller
-  newTag: v1.6.0-rc.1
+  newTag: v1.6.0-rc.2
diff --git a/apps/jupyter/notebook-controller/upstream/crd/bases/kubeflow.org_notebooks.yaml b/apps/jupyter/notebook-controller/upstream/crd/bases/kubeflow.org_notebooks.yaml
@@ -3076,13 +3076,19 @@ spec:
                     lastProbeTime:
                       format: date-time
                       type: string
+                    lastTransitionTime:
+                      format: date-time
+                      type: string
                     message:
                       type: string
                     reason:
                       type: string
+                    status:
+                      type: string
                     type:
                       type: string
                   required:
+                  - status
                   - type
                   type: object
                 type: array
@@ -6199,13 +6205,19 @@ spec:
                     lastProbeTime:
                       format: date-time
                       type: string
+                    lastTransitionTime:
+                      format: date-time
+                      type: string
                     message:
                       type: string
                     reason:
                       type: string
+                    status:
+                      type: string
                     type:
                       type: string
                   required:
+                  - status
                   - type
                   type: object
                 type: array
@@ -9322,13 +9334,19 @@ spec:
                     lastProbeTime:
                       format: date-time
                       type: string
+                    lastTransitionTime:
+                      format: date-time
+                      type: string
                     message:
                       type: string
                     reason:
                       type: string
+                    status:
+                      type: string
                     type:
                       type: string
                   required:
+                  - status
                   - type
                   type: object
                 type: array

diff --git a/apps/profiles/upstream/base/kustomization.yaml b/apps/profiles/upstream/base/kustomization.yaml
@@ -11,7 +11,7 @@ patchesStrategicMerge:
 
 images:
 - name: docker.io/kubeflownotebookswg/profile-controller
-  newTag: v1.6.0-rc.1
+  newTag: v1.6.0-rc.2
 
 configMapGenerator:
 - name: namespace-labels-data

diff --git a/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml b/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml
@@ -28,4 +28,4 @@ vars:
 
 images:
 - name: docker.io/kubeflownotebookswg/kfam
-  newTag: v1.6.0-rc.1
+  newTag: v1.6.0-rc.2
diff --git a/apps/profiles/upstream/samples/_v1_profile.yaml b/apps/profiles/upstream/samples/_v1_profile.yaml
@@ -1,6 +1,8 @@
 apiVersion: kubeflow.org/v1
 kind: Profile
 metadata:
-  name: profile-sample
+  name: test-user-profile
 spec:
-  # TODO(user): Add fields here
+  owner:
+    kind: User
+    name: [email protected]
diff --git a/apps/profiles/upstream/samples/_v1_profile_aws_iam.yaml b/apps/profiles/upstream/samples/_v1_profile_aws_iam.yaml
@@ -0,0 +1,12 @@
+apiVersion: kubeflow.org/v1
+kind: Profile
+metadata:
+  name: profile-aws-iam
+spec:
+  owner:
+    kind: User
+    name: [email protected]
+  plugins:
+  - kind: AwsIamForServiceAccount
+    spec:
+      awsIamRole: arn:aws:iam::account-id:role/s3-reader
diff --git a/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml b/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml
@@ -12,4 +12,4 @@ patchesStrategicMerge:
 - patches/add_controller_config.yaml
 images:
 - name: docker.io/kubeflownotebookswg/tensorboard-controller
-  newTag: v1.6.0-rc.1
+  newTag: v1.6.0-rc.2
diff --git a/apps/tensorboard/tensorboards-web-app/upstream/base/kustomization.yaml b/apps/tensorboard/tensorboards-web-app/upstream/base/kustomization.yaml
@@ -13,7 +13,7 @@ commonLabels:
   kustomize.component: tensorboards-web-app
 images:
 - name: docker.io/kubeflownotebookswg/tensorboards-web-app
-  newTag: v1.6.0-rc.1
+  newTag: v1.6.0-rc.2
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:

diff --git a/apps/volumes-web-app/upstream/base/kustomization.yaml b/apps/volumes-web-app/upstream/base/kustomization.yaml
@@ -13,7 +13,7 @@ commonLabels:
   kustomize.component: volumes-web-app
 images:
 - name: docker.io/kubeflownotebookswg/volumes-web-app
-  newTag: v1.6.0-rc.1
+  newTag: v1.6.0-rc.2
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:

diff --git a/openshift/openshiftstack/application/istio-1-14-OpenShift/overlays/cni/configmap.yaml b/openshift/openshiftstack/application/istio-1-14-OpenShift/overlays/cni/configmap.yaml
@@ -104,7 +104,7 @@ data:
         "sts": {
           "servicePort": 0
         },
-        "tag": "1.14.0",
+        "tag": "1.11.0",
         "tracer": {
           "datadog": {
             "address": "$(HOST_IP):8126"