Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modify istio-1-14 paths and helm chart based on kubeflow patch release #446

Merged
merged 7 commits into from
Sep 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/awslabs/kubeflow-manifests/issues)
![current development version](https://img.shields.io/badge/Kubeflow-v1.6.0-green)
![current development version](https://img.shields.io/badge/Kubeflow-v1.6.1--rc.0-green)
[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](./LICENSE)
# Kubeflow on AWS

Expand Down
10 changes: 5 additions & 5 deletions awsconfigs/apps/jupyter-web-app/configs/spawner_ui_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spawnerFormDefaults:
value: public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2-2022-09-20
# The list of available standard container Images
options:
- kubeflownotebookswg/jupyter-scipy:v1.6.0
- kubeflownotebookswg/jupyter-scipy:v1.6.1-rc.0
- public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-gpu-py39-cu112-ubuntu20.04-e3-v1.2-2022-09-20
- public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2-2022-09-20
- public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.0-gpu-py38-cu116-ubuntu20.04-ec2-2022-09-20
Expand All @@ -30,10 +30,10 @@ spawnerFormDefaults:
# 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
value: kubeflownotebookswg/codeserver-python:v1.6.1-rc.0
# The list of available standard container Images
options:
- kubeflownotebookswg/codeserver-python:v1.6.0
- kubeflownotebookswg/codeserver-python:v1.6.1-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: kubeflownotebookswg/rstudio-tidyverse:v1.6.0
value: kubeflownotebookswg/rstudio-tidyverse:v1.6.1-rc.0
# The list of available standard container Images
options:
- kubeflownotebookswg/rstudio-tidyverse:v1.6.0
- kubeflownotebookswg/rstudio-tidyverse:v1.6.1-rc.0
# If true, hide registry and/or tag name in the image selection dropdown
hideRegistry: true
hideTag: false
Expand Down
8 changes: 0 additions & 8 deletions awsconfigs/common/istio/kustomization.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions awsconfigs/common/istio/patches/service.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
- args:
- --tlsCertFile=/etc/webhook/certs/tls.crt
- --tlsKeyFile=/etc/webhook/certs/tls.key
image: docker.io/kubeflownotebookswg/poddefaults-webhook:v1.6.0
image: docker.io/kubeflownotebookswg/poddefaults-webhook:v1.6.1-rc.0
name: admission-webhook
ports:
- containerPort: 4443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
value: 'false'
- name: DASHBOARD_LINKS_CONFIGMAP
value: centraldashboard-config
image: docker.io/kubeflownotebookswg/centraldashboard:v1.6.0
image: docker.io/kubeflownotebookswg/centraldashboard:v1.6.1-rc.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ data:
\ Such values are the names of the\n# Volumes as well as their StorageClass\n\
spawnerFormDefaults:\n image:\n # The container Image for the user's Jupyter\
\ Notebook\n value: public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2-2022-09-20\n\
\ # The list of available standard container Images\n options:\n - kubeflownotebookswg/jupyter-scipy:v1.6.0\n\
\ # The list of available standard container Images\n options:\n - kubeflownotebookswg/jupyter-scipy:v1.6.1-rc.0\n\
\ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-gpu-py39-cu112-ubuntu20.04-e3-v1.2-2022-09-20\n\
\ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-tensorflow:2.9.1-cpu-py39-ubuntu20.04-e3-v1.2-2022-09-20\n\
\ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.0-gpu-py38-cu116-ubuntu20.04-ec2-2022-09-20\n\
\ - public.ecr.aws/kubeflow-on-aws/notebook-servers/jupyter-pytorch:1.12.0-cpu-py38-ubuntu20.04-ec2-2022-09-20\n\
\ imageGroupOne:\n # The container Image for the user's Group One Server\n\
\ # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`\n # is applied\
\ to notebook in this group, configuring\n # the Istio rewrite for containers\
\ that host their web UI at `/`\n value: kubeflownotebookswg/codeserver-python:v1.6.0\n\
\ # The list of available standard container Images\n options:\n - kubeflownotebookswg/codeserver-python:v1.6.0\n\
\ that host their web UI at `/`\n value: kubeflownotebookswg/codeserver-python:v1.6.1-rc.0\n\
\ # The list of available standard container Images\n options:\n - kubeflownotebookswg/codeserver-python:v1.6.1-rc.0\n\
\ imageGroupTwo:\n # The container Image for the user's Group Two Server\n\
\ # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`\n # is applied\
\ to notebook in this group, configuring\n # the Istio rewrite for containers\
\ that host their web UI at `/`\n # The annotation `notebooks.kubeflow.org/http-headers-request-set`\n\
\ # is applied to notebook in this group, configuring Istio\n # to add the\
\ `X-RStudio-Root-Path` header to requests\n value: kubeflownotebookswg/rstudio-tidyverse:v1.6.0\n\
\ # The list of available standard container Images\n options:\n - kubeflownotebookswg/rstudio-tidyverse:v1.6.0\n\
\ `X-RStudio-Root-Path` header to requests\n value: kubeflownotebookswg/rstudio-tidyverse:v1.6.1-rc.0\n\
\ # The list of available standard container Images\n options:\n - kubeflownotebookswg/rstudio-tidyverse:v1.6.1-rc.0\n\
\ # If true, hide registry and/or tag name in the image selection dropdown\n\
\ hideRegistry: true\n hideTag: false\n allowCustomImage: true\n # If true,\
\ users can input custom images\n # If false, users can only select from the\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
value: ''
- name: APP_SECURE_COOKIES
value: $(JWA_APP_SECURE_COOKIES)
image: docker.io/kubeflownotebookswg/jupyter-web-app:v1.6.0
image: docker.io/kubeflownotebookswg/jupyter-web-app:v1.6.1-rc.0
name: jupyter-web-app
ports:
- containerPort: 5000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ rules:
- retry
- terminate
- unarchive
- reportMetrics
- readArtifact
- apiGroups:
- pipelines.kubeflow.org
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,18 @@ rules:
- pipelines
- pipelines/versions
- experiments
- runs
- jobs
verbs:
- get
- list
- apiGroups:
- pipelines.kubeflow.org
resources:
- runs
verbs:
- get
- list
- readArtifact
- apiGroups:
- kubeflow.org
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ rules:
- get
- list
- watch
- apiGroups:
- ''
resources:
- namespaces
verbs:
- get
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: v1
data:
MULTIUSER: 'true'
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/component: ml-pipeline
app.kubernetes.io/name: kubeflow-pipelines
application-crd-id: kubeflow-pipelines
name: persistenceagent-config-56mkmd426t
namespace: kubeflow
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
data:
ConMaxLifeTime: 120s
appName: pipeline
appVersion: 2.0.0-alpha.3
appVersion: 2.0.0-alpha.5
autoUpdatePipelineDefaultVersion: 'true'
bucketName: mlpipeline
cacheDb: cachedb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
name: mysql-secret
- name: NAMESPACE_TO_WATCH
value: ''
image: gcr.io/ml-pipeline/cache-server:2.0.0-alpha.3
image: gcr.io/ml-pipeline/cache-server:2.0.0-alpha.5
imagePullPolicy: Always
name: server
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
component: metadata-envoy
spec:
containers:
- image: gcr.io/ml-pipeline/metadata-envoy:2.0.0-alpha.3
- image: gcr.io/ml-pipeline/metadata-envoy:2.0.0-alpha.5
name: container
ports:
- containerPort: 9090
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ spec:
- env:
- name: NAMESPACE_TO_WATCH
value: ''
image: gcr.io/ml-pipeline/metadata-writer:2.0.0-alpha.3
image: gcr.io/ml-pipeline/metadata-writer:2.0.0-alpha.5
name: main
serviceAccountName: kubeflow-pipelines-metadata-writer
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,14 @@ spec:
value: '86400'
- name: NUM_WORKERS
value: '2'
image: gcr.io/ml-pipeline/persistenceagent:2.0.0-alpha.3
- name: KUBEFLOW_USERID_HEADER
value: kubeflow-userid
- name: KUBEFLOW_USERID_PREFIX
value: ''
envFrom:
- configMapRef:
name: persistenceagent-config-56mkmd426t
image: gcr.io/ml-pipeline/persistenceagent:2.0.0-alpha.5
imagePullPolicy: IfNotPresent
name: ml-pipeline-persistenceagent
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
configMapKeyRef:
key: cronScheduleTimezone
name: pipeline-install-config
image: gcr.io/ml-pipeline/scheduledworkflow:2.0.0-alpha.3
image: gcr.io/ml-pipeline/scheduledworkflow:2.0.0-alpha.5
imagePullPolicy: IfNotPresent
name: ml-pipeline-scheduledworkflow
serviceAccountName: ml-pipeline-scheduledworkflow
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
name: mlpipeline-minio-artifact
- name: ALLOW_CUSTOM_VISUALIZATIONS
value: 'true'
image: gcr.io/ml-pipeline/frontend:2.0.0-alpha.3
image: gcr.io/ml-pipeline/frontend:2.0.0-alpha.5
imagePullPolicy: IfNotPresent
livenessProbe:
exec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/ml-pipeline/viewer-crd-controller:2.0.0-alpha.3
image: gcr.io/ml-pipeline/viewer-crd-controller:2.0.0-alpha.5
imagePullPolicy: Always
name: ml-pipeline-viewer-crd
serviceAccountName: ml-pipeline-viewer-crd-service-account
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
application-crd-id: kubeflow-pipelines
spec:
containers:
- image: gcr.io/ml-pipeline/visualization-server:2.0.0-alpha.3
- image: gcr.io/ml-pipeline/visualization-server:2.0.0-alpha.5
imagePullPolicy: IfNotPresent
livenessProbe:
exec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@ rules:
- get
- list
- watch
- apiGroups:
- ''
resources:
- namespaces
verbs:
- get
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ rules:
- retry
- terminate
- unarchive
- reportMetrics
- readArtifact
- apiGroups:
- pipelines.kubeflow.org
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,18 @@ rules:
- pipelines
- pipelines/versions
- experiments
- runs
- jobs
verbs:
- get
- list
- apiGroups:
- pipelines.kubeflow.org
resources:
- runs
verbs:
- get
- list
- readArtifact
- apiGroups:
- kubeflow.org
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ rules:
- get
- list
- watch
- apiGroups:
- ''
resources:
- namespaces
verbs:
- get
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: v1
data:
MULTIUSER: 'true'
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/component: ml-pipeline
app.kubernetes.io/name: kubeflow-pipelines
application-crd-id: kubeflow-pipelines
name: persistenceagent-config-56mkmd426t
namespace: kubeflow
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
data:
ConMaxLifeTime: 120s
appName: pipeline
appVersion: 2.0.0-alpha.3
appVersion: 2.0.0-alpha.5
autoUpdatePipelineDefaultVersion: 'true'
bucketName: '{{ .Values.s3.bucketName }}'
cacheDb: cachedb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
name: mysql-secret
- name: NAMESPACE_TO_WATCH
value: ''
image: gcr.io/ml-pipeline/cache-server:2.0.0-alpha.3
image: gcr.io/ml-pipeline/cache-server:2.0.0-alpha.5
imagePullPolicy: Always
name: server
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
component: metadata-envoy
spec:
containers:
- image: gcr.io/ml-pipeline/metadata-envoy:2.0.0-alpha.3
- image: gcr.io/ml-pipeline/metadata-envoy:2.0.0-alpha.5
name: container
ports:
- containerPort: 9090
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ spec:
- env:
- name: NAMESPACE_TO_WATCH
value: ''
image: gcr.io/ml-pipeline/metadata-writer:2.0.0-alpha.3
image: gcr.io/ml-pipeline/metadata-writer:2.0.0-alpha.5
name: main
serviceAccountName: kubeflow-pipelines-metadata-writer
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,14 @@ spec:
value: '86400'
- name: NUM_WORKERS
value: '2'
image: gcr.io/ml-pipeline/persistenceagent:2.0.0-alpha.3
- name: KUBEFLOW_USERID_HEADER
value: kubeflow-userid
- name: KUBEFLOW_USERID_PREFIX
value: ''
envFrom:
- configMapRef:
name: persistenceagent-config-56mkmd426t
image: gcr.io/ml-pipeline/persistenceagent:2.0.0-alpha.5
imagePullPolicy: IfNotPresent
name: ml-pipeline-persistenceagent
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
configMapKeyRef:
key: cronScheduleTimezone
name: pipeline-install-config
image: gcr.io/ml-pipeline/scheduledworkflow:2.0.0-alpha.3
image: gcr.io/ml-pipeline/scheduledworkflow:2.0.0-alpha.5
imagePullPolicy: IfNotPresent
name: ml-pipeline-scheduledworkflow
serviceAccountName: ml-pipeline-scheduledworkflow
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ spec:
name: mlpipeline-minio-artifact
- name: ALLOW_CUSTOM_VISUALIZATIONS
value: 'true'
image: gcr.io/ml-pipeline/frontend:2.0.0-alpha.3
image: gcr.io/ml-pipeline/frontend:2.0.0-alpha.5
imagePullPolicy: IfNotPresent
livenessProbe:
exec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/ml-pipeline/viewer-crd-controller:2.0.0-alpha.3
image: gcr.io/ml-pipeline/viewer-crd-controller:2.0.0-alpha.5
imagePullPolicy: Always
name: ml-pipeline-viewer-crd
serviceAccountName: ml-pipeline-viewer-crd-service-account
Loading