Skip to content

Commit 30d0c45

Browse files
authored
Merge pull request #170 from hbelmiro/rebase-2.5.0
Rebase 2.5.0
2 parents 4e9be51 + 098426f commit 30d0c45

File tree

498 files changed

+9580
-20805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

498 files changed

+9580
-20805
lines changed

.cloudbuild.yaml

Lines changed: 0 additions & 272 deletions
This file was deleted.

.github/actions/kfp-cluster/action.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ inputs:
55
k8s_version:
66
description: "The Kubernetes version to use for the Kind cluster"
77
required: true
8+
proxy:
9+
description: "If KFP should be deployed with proxy configuration"
10+
required: false
11+
default: false
812

913
runs:
1014
using: "composite"
@@ -17,10 +21,26 @@ runs:
1721
version: v0.25.0
1822
node_image: kindest/node:${{ inputs.k8s_version }}
1923

24+
- name: Deploy Squid
25+
id: deploy-squid
26+
if: ${{ (inputs.proxy == 'true' )}}
27+
shell: bash
28+
run: ./.github/resources/squid/deploy-squid.sh
29+
2030
- name: Build images
2131
shell: bash
22-
run: ./.github/resources/scripts/build-images.sh
32+
run: |
33+
if [ "${{ inputs.proxy }}" = "true" ]; then
34+
./.github/resources/scripts/build-images.sh --proxy
35+
else
36+
./.github/resources/scripts/build-images.sh
37+
fi
2338
2439
- name: Deploy KFP
2540
shell: bash
26-
run: ./.github/resources/scripts/deploy-kfp.sh
41+
run: |
42+
if [ "${{ inputs.proxy }}" = "true" ]; then
43+
./.github/resources/scripts/deploy-kfp.sh --proxy
44+
else
45+
./.github/resources/scripts/deploy-kfp.sh
46+
fi

.github/actions/kfp-tekton-cluster/action.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: ml-pipeline
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: ml-pipeline-api-server
10+
env:
11+
- name: V2_DRIVER_IMAGE
12+
value: kind-registry:5000/driver
13+
- name: V2_LAUNCHER_IMAGE
14+
value: kind-registry:5000/launcher
15+
- name: LOG_LEVEL
16+
value: "debug"
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- ../../../../../../manifests/kustomize/env/platform-agnostic
6+
7+
images:
8+
- name: ghcr.io/kubeflow/kfp-api-server
9+
newName: kind-registry:5000/apiserver
10+
newTag: latest
11+
- name: ghcr.io/kubeflow/kfp-persistence-agent
12+
newName: kind-registry:5000/persistenceagent
13+
newTag: latest
14+
- name: ghcr.io/kubeflow/kfp-scheduled-workflow-controller
15+
newName: kind-registry:5000/scheduledworkflow
16+
newTag: latest
17+
18+
patches:
19+
- path: apiserver-env.yaml
20+
- path: workflow-disable-logs-patch.yaml
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: workflow-controller-configmap
5+
data:
6+
artifactRepository: |
7+
archiveLogs: false
8+
s3:
9+
endpoint: "minio-service.$(kfp-namespace):9000"
10+
bucket: "$(kfp-artifact-bucket-name)"
11+
keyFormat: "artifacts/{{workflow.name}}/{{workflow.creationTimestamp.Y}}/{{workflow.creationTimestamp.m}}/{{workflow.creationTimestamp.d}}/{{pod.name}}"
12+
insecure: true
13+
accessKeySecret:
14+
name: mlpipeline-minio-artifact
15+
key: accesskey
16+
secretKeySecret:
17+
name: mlpipeline-minio-artifact
18+
key: secretkey
19+
executor: |
20+
imagePullPolicy: IfNotPresent

0 commit comments

Comments
 (0)