Skip to content

Commit

Permalink
Update kubeflow/kubeflow manifests from v1.6.0-rc.0 (kubeflow#2242)
Browse files Browse the repository at this point in the history
(cherry picked from commit 6b60781)
  • Loading branch information
kimwnasptd authored and VaishnaviHire committed Aug 15, 2022
1 parent 10f02aa commit a7f2a10
Show file tree
Hide file tree
Showing 62 changed files with 9,657 additions and 2,883 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ 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.5.0](https://github.com/kubeflow/kubeflow/tree/v1.5.0/components/notebook-controller/config) |
| Tensorboard Controller | apps/tensorboard/tensorboard-controller/upstream | [v1.5.0](https://github.com/kubeflow/kubeflow/tree/v1.5.0/components/tensorboard-controller/config) |
| Central Dashboard | apps/centraldashboard/upstream | [v1.5.0](https://github.com/kubeflow/kubeflow/tree/v1.5.0/components/centraldashboard/manifests) |
| Profiles + KFAM | apps/profiles/upstream | [v1.5.0](https://github.com/kubeflow/kubeflow/tree/v1.5.0/components/profile-controller/config) |
| PodDefaults Webhook | apps/admission-webhook/upstream | [v1.5.0](https://github.com/kubeflow/kubeflow/tree/v1.5.0/components/admission-webhook/manifests) |
| Jupyter Web App | apps/jupyter/jupyter-web-app/upstream | [v1.5.0](https://github.com/kubeflow/kubeflow/tree/v1.5.0/components/crud-web-apps/jupyter/manifests) |
| Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.5.0](https://github.com/kubeflow/kubeflow/tree/v1.5.0/components/crud-web-apps/tensorboards/manifests) |
| Volumes Web App | apps/volumes-web-app/upstream | [v1.5.0](https://github.com/kubeflow/kubeflow/tree/v1.5.0/components/crud-web-apps/volumes/manifests) |
| Notebook Controller | apps/jupyter/notebook-controller/upstream | [v1.6.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.0/components/notebook-controller/config) |
| Tensorboard Controller | apps/tensorboard/tensorboard-controller/upstream | [v1.6.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.0/components/tensorboard-controller/config) |
| Central Dashboard | apps/centraldashboard/upstream | [v1.6.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.0/components/centraldashboard/manifests) |
| Profiles + KFAM | apps/profiles/upstream | [v1.6.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.0/components/profile-controller/config) |
| PodDefaults Webhook | apps/admission-webhook/upstream | [v1.6.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.0/components/admission-webhook/manifests) |
| Jupyter Web App | apps/jupyter/jupyter-web-app/upstream | [v1.6.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.0/components/crud-web-apps/jupyter/manifests) |
| Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.6.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.0/components/crud-web-apps/tensorboards/manifests) |
| Volumes Web App | apps/volumes-web-app/upstream | [v1.6.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.6.0-rc.0/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.0](https://github.com/kserve/models-web-app/tree/v0.8.0/config) |
Expand Down
92 changes: 54 additions & 38 deletions apps/admission-webhook/upstream/base/crd.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: poddefaults.kubeflow.org
Expand All @@ -8,46 +8,62 @@ spec:
kind: PodDefault
plural: poddefaults
singular: poddefault
preserveUnknownFields: false
scope: Namespaced
version: v1alpha1
validation:
openAPIV3Schema:
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
versions:
- name: v1alpha1
served: true
storage: true
schema:
openAPIV3Schema:
properties:
desc:
apiVersion:
type: string
serviceAccountName:
kind:
type: string
automountServiceAccountToken:
type: boolean
env:
items:
type: object
type: array
envFrom:
items:
type: object
type: array
selector:
metadata:
type: object
volumeMounts:
items:
type: object
type: array
volumes:
items:
type: object
type: array
required:
- selector
type: object
status:
spec:
properties:
desc:
type: string
serviceAccountName:
type: string
automountServiceAccountToken:
type: boolean
env:
items:
type: object
x-kubernetes-preserve-unknown-fields: true
type: array
x-kubernetes-preserve-unknown-fields: true
envFrom:
items:
type: object
x-kubernetes-preserve-unknown-fields: true
type: array
x-kubernetes-preserve-unknown-fields: true
selector:
type: object
x-kubernetes-preserve-unknown-fields: true
volumeMounts:
items:
type: object
x-kubernetes-preserve-unknown-fields: true
type: array
x-kubernetes-preserve-unknown-fields: true
volumes:
items:
type: object
x-kubernetes-preserve-unknown-fields: true
type: array
x-kubernetes-preserve-unknown-fields: true
required:
- selector
type: object
x-kubernetes-preserve-unknown-fields: true
status:
type: object
x-kubernetes-preserve-unknown-fields: true
type: object
type: object
x-kubernetes-preserve-unknown-fields: true
2 changes: 1 addition & 1 deletion apps/admission-webhook/upstream/base/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
sidecar.istio.io/inject: "false"
spec:
containers:
- image: public.ecr.aws/j1r0q0g6/notebooks/admission-webhook
- image: docker.io/kubeflownotebookswg/poddefaults-webhook
name: admission-webhook
volumeMounts:
- mountPath: /etc/webhook/certs
Expand Down
5 changes: 2 additions & 3 deletions apps/admission-webhook/upstream/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ commonLabels:
app.kubernetes.io/component: poddefaults
app.kubernetes.io/name: poddefaults
images:
- name: public.ecr.aws/j1r0q0g6/notebooks/admission-webhook
newName: public.ecr.aws/j1r0q0g6/notebooks/admission-webhook
newTag: v1.5.0
- name: docker.io/kubeflownotebookswg/poddefaults-webhook
newTag: v1.6.0-rc.0
namespace: kubeflow
generatorOptions:
disableNameSuffixHash: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
apiVersion: admissionregistration.k8s.io/v1beta1
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
metadata:
name: mutating-webhook-configuration
webhooks:
- clientConfig:
- admissionReviewVersions:
- v1beta1
- v1
clientConfig:
caBundle: ""
service:
name: service
path: /apply-poddefault
sideEffects: None
failurePolicy: Fail
name: $(podDefaultsDeploymentName).kubeflow.org
namespaceSelector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: admissionregistration.k8s.io/v1beta1
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
metadata:
name: mutating-webhook-configuration
Expand Down
2 changes: 1 addition & 1 deletion apps/centraldashboard/upstream/base/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: centraldashboard
image: public.ecr.aws/j1r0q0g6/notebooks/central-dashboard
image: docker.io/kubeflownotebookswg/centraldashboard
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
5 changes: 2 additions & 3 deletions apps/centraldashboard/upstream/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ commonLabels:
app.kubernetes.io/component: centraldashboard
app.kubernetes.io/name: centraldashboard
images:
- name: public.ecr.aws/j1r0q0g6/notebooks/central-dashboard
newName: public.ecr.aws/j1r0q0g6/notebooks/central-dashboard
newTag: v1.5.0
- name: docker.io/kubeflownotebookswg/centraldashboard
newTag: v1.6.0-rc.0
configMapGenerator:
- envs:
- params.env
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@
spawnerFormDefaults:
image:
# The container Image for the user's Jupyter Notebook
value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.5.0
value: kubeflownotebookswg/jupyter-scipy:v1.5.0
# The list of available standard container Images
options:
- public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.5.0
- public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-full:v1.5.0
- public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-cuda-full:v1.5.0
- public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-full:v1.5.0
- public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-cuda-full:v1.5.0
- kubeflownotebookswg/jupyter-scipy:v1.6.0-rc.0
- kubeflownotebookswg/jupyter-pytorch-full:v1.6.0-rc.0
- kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.6.0-rc.0
- kubeflownotebookswg/jupyter-tensorflow-full:v1.6.0-rc.0
- kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.6.0-rc.0
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: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:v1.5.0
value: kubeflownotebookswg/codeserver-python:v1.6.0-rc.0
# The list of available standard container Images
options:
- public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:v1.5.0
- kubeflownotebookswg/codeserver-python:v1.6.0-rc.0
imageGroupTwo:
# The container Image for the user's Group Two Server
# The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
Expand All @@ -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: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:v1.5.0
value: kubeflownotebookswg/rstudio-tidyverse:v1.6.0-rc.0
# The list of available standard container Images
options:
- public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:v1.5.0
- kubeflownotebookswg/rstudio-tidyverse:v1.6.0-rc.0
# If true, hide registry and/or tag name in the image selection dropdown
hideRegistry: true
hideTag: false
Expand Down
4 changes: 3 additions & 1 deletion apps/jupyter/jupyter-web-app/upstream/base/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
spec:
containers:
- name: jupyter-web-app
image: public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app
image: docker.io/kubeflownotebookswg/jupyter-web-app
ports:
- containerPort: 5000
volumeMounts:
Expand All @@ -28,6 +28,8 @@ spec:
value: $(JWA_USERID_HEADER)
- name: USERID_PREFIX
value: $(JWA_USERID_PREFIX)
- name: APP_SECURE_COOKIES
value: $(JWA_APP_SECURE_COOKIES)
serviceAccountName: service-account
volumes:
- configMap:
Expand Down
5 changes: 2 additions & 3 deletions apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ commonLabels:
app: jupyter-web-app
kustomize.component: jupyter-web-app
images:
- name: public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app
newName: public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app
newTag: v1.5.0
- name: docker.io/kubeflownotebookswg/jupyter-web-app
newTag: v1.6.0-rc.0
# We need the name to be unique without the suffix because the original name is what
# gets used with patches
configMapGenerator:
Expand Down
1 change: 1 addition & 0 deletions apps/jupyter/jupyter-web-app/upstream/base/params.env
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ JWA_PREFIX=/jupyter
JWA_CLUSTER_DOMAIN=cluster.local
JWA_USERID_HEADER=kubeflow-userid
JWA_USERID_PREFIX=
JWA_APP_SECURE_COOKIES=true
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ kind: Kustomization
resources:
- ../default
images:
- name: public.ecr.aws/j1r0q0g6/notebooks/notebook-controller
newName: public.ecr.aws/j1r0q0g6/notebooks/notebook-controller
newTag: v1.5.0
- name: docker.io/kubeflownotebookswg/notebook-controller
newTag: v1.6.0-rc.0
Loading

0 comments on commit a7f2a10

Please sign in to comment.