Skip to content

Commit db0b0b0

Browse files
committed
Restore manifests and vscode config to match upstream/master
Signed-off-by: kaikaila <[email protected]>
1 parent 675bd10 commit db0b0b0

File tree

7 files changed

+53
-59
lines changed

7 files changed

+53
-59
lines changed

manifests/kustomize/base/crds/pipelines.kubeflow.org_pipelines.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ spec:
4141
properties:
4242
description:
4343
type: string
44+
displayName:
45+
type: string
4446
type: object
4547
type: object
4648
served: true

manifests/kustomize/base/crds/pipelines.kubeflow.org_pipelineversions.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ spec:
4343
type: string
4444
description:
4545
type: string
46+
displayName:
47+
type: string
4648
pipelineName:
4749
type: string
4850
pipelineSpec:

manifests/kustomize/base/pipeline/ml-pipeline-apiserver-deployment.yaml

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -131,41 +131,26 @@ spec:
131131
- name: grpc
132132
containerPort: 8887
133133
readinessProbe:
134-
exec:
135-
command:
136-
- wget
137-
- -q # quiet
138-
- -S # show server response
139-
- -O
140-
- "-" # Redirect output to stdout
141-
- http://localhost:8888/apis/v1beta1/healthz
134+
httpGet:
135+
path: /apis/v1beta1/healthz
136+
port: 8888
142137
initialDelaySeconds: 3
143138
periodSeconds: 5
144139
timeoutSeconds: 2
145140
livenessProbe:
146-
exec:
147-
command:
148-
- wget
149-
- -q # quiet
150-
- -S # show server response
151-
- -O
152-
- "-" # Redirect output to stdout
153-
- http://localhost:8888/apis/v1beta1/healthz
141+
httpGet:
142+
path: /apis/v1beta1/healthz
143+
port: 8888
154144
initialDelaySeconds: 3
155145
periodSeconds: 5
156146
timeoutSeconds: 2
157147
# This startup probe provides up to a 60 second grace window before the
158148
# liveness probe takes over to accomodate the occasional database
159149
# migration.
160150
startupProbe:
161-
exec:
162-
command:
163-
- wget
164-
- -q # quiet
165-
- -S # show server response
166-
- -O
167-
- "-" # Redirect output to stdout
168-
- http://localhost:8888/apis/v1beta1/healthz
151+
httpGet:
152+
path: /apis/v1beta1/healthz
153+
port: 8888
169154
failureThreshold: 12
170155
periodSeconds: 5
171156
timeoutSeconds: 2

manifests/kustomize/base/pipeline/ml-pipeline-ui-deployment.yaml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,16 @@ spec:
6868
- name: DISABLE_GKE_METADATA
6969
value: "true"
7070
readinessProbe:
71-
exec:
72-
command:
73-
- wget
74-
- -q # quiet
75-
- -S # show server response
76-
- -O
77-
- "-" # Redirect output to stdout
78-
- http://localhost:3000/apis/v1beta1/healthz
71+
httpGet:
72+
path: /apis/v1beta1/healthz
73+
port: 3000
7974
initialDelaySeconds: 3
8075
periodSeconds: 5
8176
timeoutSeconds: 2
8277
livenessProbe:
83-
exec:
84-
command:
85-
- wget
86-
- -q # quiet
87-
- -S # show server response
88-
- -O
89-
- "-" # Redirect output to stdout
90-
- http://localhost:3000/apis/v1beta1/healthz
78+
httpGet:
79+
path: /apis/v1beta1/healthz
80+
port: 3000
9181
initialDelaySeconds: 3
9282
periodSeconds: 5
9383
timeoutSeconds: 2

manifests/kustomize/base/pipeline/ml-pipeline-visualization-deployment.yaml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,16 @@ spec:
2626
- name: http
2727
containerPort: 8888
2828
readinessProbe:
29-
exec:
30-
command:
31-
- wget
32-
- -q # quiet
33-
- -S # show server response
34-
- -O
35-
- "-" # Redirect output to stdout
36-
- http://localhost:8888/
29+
httpGet:
30+
path: /
31+
port: 8888
3732
initialDelaySeconds: 3
3833
periodSeconds: 5
3934
timeoutSeconds: 2
4035
livenessProbe:
41-
exec:
42-
command:
43-
- wget
44-
- -q # quiet
45-
- -S # show server response
46-
- -O
47-
- "-" # Redirect output to stdout
48-
- http://localhost:8888/
36+
httpGet:
37+
path: /
38+
port: 8888
4939
initialDelaySeconds: 3
5040
periodSeconds: 5
5141
timeoutSeconds: 2

manifests/kustomize/env/dev/api-server-patch.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ spec:
77
template:
88
spec:
99
containers:
10-
- name: ml-pipeline-api-server
11-
image: apiserver
12-
env:
10+
- env:
1311
- name: V2_DRIVER_IMAGE
1412
value: ghcr.io/kubeflow/kfp-driver:master
1513
- name: V2_LAUNCHER_IMAGE
1614
value: ghcr.io/kubeflow/kfp-launcher:master
15+
name: ml-pipeline-api-server
1716
serviceAccountName: ml-pipeline

manifests/kustomize/env/dev/kustomization.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,32 @@ resources:
88
- ../platform-agnostic
99
- ../gcp/inverse-proxy
1010

11+
images:
12+
- name: ghcr.io/kubeflow/kfp-api-server
13+
newTag: master
14+
- name: ghcr.io/kubeflow/kfp-frontend
15+
newTag: master
16+
- name: ghcr.io/kubeflow/kfp-persistence-agent
17+
newTag: master
18+
- name: ghcr.io/kubeflow/kfp-scheduled-workflow-controller
19+
newTag: master
20+
- name: ghcr.io/kubeflow/kfp-cache-deployer
21+
newTag: master
22+
- name: ghcr.io/kubeflow/kfp-cache-server
23+
newTag: master
24+
- name: ghcr.io/kubeflow/kfp-metadata-envoy
25+
newTag: master
26+
- name: ghcr.io/kubeflow/kfp-metadata-writer
27+
newTag: master
28+
- name: ghcr.io/kubeflow/kfp-viewer-crd-controller
29+
newTag: master
30+
- name: ghcr.io/kubeflow/kfp-visualization-server
31+
newTag: master
32+
- name: ghcr.io/kubeflow/kfp-inverse-proxy-agent
33+
newTag: master
34+
35+
patches:
36+
- path: api-server-patch.yaml
1137
# !!! If you want to customize the namespace,
1238
# please refer sample/cluster-scoped-resources to update the namespace for cluster-scoped-resources
1339
namespace: kubeflow

0 commit comments

Comments
 (0)