Skip to content

Commit

Permalink
test(kfp): upgrade to 1.8.0-alpha.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Bobgy committed Dec 1, 2021
1 parent 65079ce commit a59d753
Show file tree
Hide file tree
Showing 188 changed files with 698 additions and 451 deletions.
153 changes: 97 additions & 56 deletions acm-repos/kfp-standalone-1/kfp-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,85 @@ spec:
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
application-crd-id: kubeflow-pipelines
name: scheduledworkflows.kubeflow.org
spec:
group: kubeflow.org
names:
kind: ScheduledWorkflow
listKind: ScheduledWorkflowList
plural: scheduledworkflows
shortNames:
- swf
singular: scheduledworkflow
scope: Namespaced
versions:
- name: v1beta1
schema:
openAPIV3Schema:
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
type: object
x-kubernetes-map-type: atomic
x-kubernetes-preserve-unknown-fields: true
status:
type: object
x-kubernetes-map-type: atomic
x-kubernetes-preserve-unknown-fields: true
required:
- spec
- status
type: object
served: true
storage: true
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
application-crd-id: kubeflow-pipelines
name: viewers.kubeflow.org
spec:
group: kubeflow.org
names:
kind: Viewer
listKind: ViewerList
plural: viewers
shortNames:
- vi
singular: viewer
scope: Namespaced
versions:
- name: v1beta1
schema:
openAPIV3Schema:
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
type: object
x-kubernetes-map-type: atomic
x-kubernetes-preserve-unknown-fields: true
required:
- spec
type: object
served: true
storage: true
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
labels:
application-crd-id: kubeflow-pipelines
Expand Down Expand Up @@ -452,48 +531,6 @@ spec:
type: object
version: v1beta1
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
labels:
application-crd-id: kubeflow-pipelines
name: scheduledworkflows.kubeflow.org
spec:
group: kubeflow.org
names:
kind: ScheduledWorkflow
listKind: ScheduledWorkflowList
plural: scheduledworkflows
shortNames:
- swf
singular: scheduledworkflow
scope: Namespaced
versions:
- name: v1beta1
served: true
storage: true
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
labels:
application-crd-id: kubeflow-pipelines
name: viewers.kubeflow.org
spec:
group: kubeflow.org
names:
kind: Viewer
listKind: ViewerList
plural: viewers
shortNames:
- vi
singular: viewer
scope: Namespaced
versions:
- name: v1beta1
served: true
storage: true
---
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down Expand Up @@ -1455,7 +1492,7 @@ apiVersion: v1
data:
ConMaxLifeTime: 120s
appName: kfp-standalone-1
appVersion: 1.7.1
appVersion: 1.8.0-alpha.0
autoUpdatePipelineDefaultVersion: "true"
bucketName: mlpipeline
cacheDb: cachedb
Expand Down Expand Up @@ -1675,6 +1712,10 @@ spec:
apiVersion: v1
kind: Service
metadata:
annotations:
prometheus.io/port: "8888"
prometheus.io/scheme: http
prometheus.io/scrape: "true"
labels:
application-crd-id: kubeflow-pipelines
name: ml-pipeline
Expand Down Expand Up @@ -1755,7 +1796,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/ml-pipeline/cache-deployer:1.7.1
image: gcr.io/ml-pipeline/cache-deployer:1.8.0-alpha.0
imagePullPolicy: Always
name: main
restartPolicy: Always
Expand Down Expand Up @@ -1832,7 +1873,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/ml-pipeline/cache-server:1.7.1
image: gcr.io/ml-pipeline/cache-server:1.8.0-alpha.0
imagePullPolicy: Always
name: server
ports:
Expand Down Expand Up @@ -1917,7 +1958,7 @@ spec:
component: metadata-envoy
spec:
containers:
- image: gcr.io/ml-pipeline/metadata-envoy:1.7.1
- image: gcr.io/ml-pipeline/metadata-envoy:1.8.0-alpha.0
name: container
ports:
- containerPort: 9090
Expand Down Expand Up @@ -1982,7 +2023,7 @@ spec:
configMapKeyRef:
key: dbPort
name: pipeline-install-config
image: gcr.io/tfx-oss-public/ml_metadata_store_server:1.0.0
image: gcr.io/tfx-oss-public/ml_metadata_store_server:1.4.0
livenessProbe:
initialDelaySeconds: 3
periodSeconds: 5
Expand Down Expand Up @@ -2027,7 +2068,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/ml-pipeline/metadata-writer:1.7.1
image: gcr.io/ml-pipeline/metadata-writer:1.8.0-alpha.0
name: main
serviceAccountName: kubeflow-pipelines-metadata-writer
---
Expand Down Expand Up @@ -2115,7 +2156,7 @@ spec:
value: "86400"
- name: NUM_WORKERS
value: "2"
image: gcr.io/ml-pipeline/persistenceagent:1.7.1
image: gcr.io/ml-pipeline/persistenceagent:1.8.0-alpha.0
imagePullPolicy: IfNotPresent
name: ml-pipeline-persistenceagent
resources:
Expand Down Expand Up @@ -2156,7 +2197,7 @@ spec:
configMapKeyRef:
key: cronScheduleTimezone
name: pipeline-install-config
image: gcr.io/ml-pipeline/scheduledworkflow:1.7.1
image: gcr.io/ml-pipeline/scheduledworkflow:1.8.0-alpha.0
imagePullPolicy: IfNotPresent
name: ml-pipeline-scheduledworkflow
serviceAccountName: ml-pipeline-scheduledworkflow
Expand Down Expand Up @@ -2202,7 +2243,7 @@ spec:
name: mlpipeline-minio-artifact
- name: ALLOW_CUSTOM_VISUALIZATIONS
value: "true"
image: gcr.io/ml-pipeline/frontend:1.7.1
image: gcr.io/ml-pipeline/frontend:1.8.0-alpha.0
imagePullPolicy: IfNotPresent
livenessProbe:
exec:
Expand Down Expand Up @@ -2274,7 +2315,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/ml-pipeline/viewer-crd-controller:1.7.1
image: gcr.io/ml-pipeline/viewer-crd-controller:1.8.0-alpha.0
imagePullPolicy: Always
name: ml-pipeline-viewer-crd
serviceAccountName: ml-pipeline-viewer-crd-service-account
Expand All @@ -2301,7 +2342,7 @@ spec:
application-crd-id: kubeflow-pipelines
spec:
containers:
- image: gcr.io/ml-pipeline/visualization-server:1.7.1
- image: gcr.io/ml-pipeline/visualization-server:1.8.0-alpha.0
imagePullPolicy: IfNotPresent
livenessProbe:
exec:
Expand Down Expand Up @@ -2416,7 +2457,7 @@ spec:
secretKeyRef:
key: secretkey
name: mlpipeline-minio-artifact
image: gcr.io/ml-pipeline/api-server:1.7.1
image: gcr.io/ml-pipeline/api-server:1.8.0-alpha.0
imagePullPolicy: IfNotPresent
livenessProbe:
exec:
Expand Down Expand Up @@ -2524,7 +2565,7 @@ spec:
- env:
- name: PROXY_URL
value: https://datalab-staging.cloud.google.com/tun/m/4592f092208ecc84946b8f8f8016274df1b36a14
image: gcr.io/ml-pipeline/inverse-proxy-agent:1.7.1
image: gcr.io/ml-pipeline/inverse-proxy-agent:1.8.0-alpha.0
imagePullPolicy: IfNotPresent
name: proxy-agent
hostNetwork: true
Expand Down Expand Up @@ -2634,7 +2675,7 @@ spec:
url: https://github.com/kubeflow/pipelines
notes: Please go to [Hosted Kubeflow Pipelines Console](https://console.cloud.google.com/ai-platform/pipelines/clusters).
type: Kubeflow Pipelines
version: 1.7.1
version: 1.8.0-alpha.0
info:
- name: Console
value: https://console.cloud.google.com/ai-platform/pipelines/clusters
Expand Down
2 changes: 1 addition & 1 deletion test-infra/kfp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ KFP_STANDALONE_1_DIR=$(ACM_REPOS)/kfp-standalone-1

# Please edit the following version before running:
# make kfp-update
PIPELINES_VERSION=1.7.1
PIPELINES_VERSION=1.8.0-alpha.0
PIPELINES_SRC_REPO=https://github.com/kubeflow/pipelines.git

all: hydrate hydrate-kfp-manifests vet-kfp-manifests
Expand Down
13 changes: 3 additions & 10 deletions test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
apiVersion: kpt.dev/v1
apiVersion: kpt.dev/v1alpha1
kind: Kptfile
metadata:
name: upstream
upstream:
type: git
git:
commit: ca9b9444ac879666f6ab9e11f82a62a7890f4373
repo: https://github.com/kubeflow/pipelines
directory: /manifests/kustomize
ref: 1.7.1
updateStrategy: resource-merge
upstreamLock:
type: git
git:
repo: https://github.com/kubeflow/pipelines
directory: /manifests/kustomize
ref: 1.7.1
commit: d8e2f0d557c1cf233730ba8ee69d9aed8e0c6e19
ref: 1.8.0-alpha.0
4 changes: 2 additions & 2 deletions test-infra/kfp/kfp-standalone-1/kustomize/upstream/OWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
approvers:
- Bobgy
- IronPan
- zijianjoy
reviewers:
- Bobgy
- zijianjoy
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

apiVersion: app.k8s.io/v1beta1
kind: Application
metadata: # kpt-merge: /$(kfp-app-name)
metadata:
name: $(kfp-app-name)
annotations:
kubernetes-engine.cloud.google.com/icon: >-
Expand All @@ -28,6 +28,7 @@ spec:
url: https://www.kubeflow.org/docs/pipelines/
notes: |-
Please go to [Hosted Kubeflow Pipelines Console](https://console.cloud.google.com/ai-platform/pipelines/clusters).
info:
- name: Console
value: 'https://console.cloud.google.com/ai-platform/pipelines/clusters'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: apps/v1
kind: Deployment
metadata: # kpt-merge: /cache-deployer-deployment
metadata:
name: cache-deployer-deployment
labels:
app: cache-deployer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-role
metadata:
labels:
app: kubeflow-pipelines-cache-deployer-role
name: kubeflow-pipelines-cache-deployer-role
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-rolebinding
metadata:
name: kubeflow-pipelines-cache-deployer-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: kubeflow-pipelines-cache-deployer-role
subjects:
- kind: ServiceAccount
name: kubeflow-pipelines-cache-deployer-sa
name: kubeflow-pipelines-cache-deployer-sa
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-clusterrole
metadata:
labels:
app: kubeflow-pipelines-cache-deployer-clusterrole
name: kubeflow-pipelines-cache-deployer-clusterrole
Expand Down Expand Up @@ -32,4 +32,4 @@ rules:
resourceNames:
- kubernetes.io/*
verbs:
- approve
- approve
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-clusterrolebinding
metadata:
name: kubeflow-pipelines-cache-deployer-clusterrolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: v1
kind: ServiceAccount
metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-sa
metadata:
name: kubeflow-pipelines-cache-deployer-sa
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- cache-deployer-clusterrole.yaml
- cache-deployer-clusterrolebinding.yaml
# HACK: although a service account(SA) is not a cluster-scoped resource.
# Presence of a SA referred by a clusterrolebinding allows kustomize to auto-add
# namespace for the clusterrolebinding's SA ref.
- cache-deployer-sa.yaml

Loading

0 comments on commit a59d753

Please sign in to comment.