Skip to content

Commit 70fe793

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #147 from mprahl/sync-stable
Merge master into stable
2 parents 426d49c + f82067f commit 70fe793

File tree

1,256 files changed

+25816
-72437
lines changed

Some content is hidden

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

1,256 files changed

+25816
-72437
lines changed

‎.dockerignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,14 @@ bower_components
33
dist
44
**/node_modules
55
backend/build
6+
backend/Dockerfile
7+
backend/Dockerfile.cacheserver
8+
backend/Dockerfile.conformance
9+
backend/Dockerfile.driver
10+
backend/Dockerfile.launcher
11+
backend/Dockerfile.persistenceagent
12+
backend/Dockerfile.scheduledworkflow
13+
backend/Dockerfile.viewercontroller
14+
backend/Dockerfile.visualization
15+
frontend/Dockerfile
616
v2/build

‎.github/ISSUE_TEMPLATE/CHORE.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: 🧹 Chore
3+
about: Create a Chore on Kubeflow Pipelines
4+
title: "chore(<component>): <Chore Name>"
5+
---
6+
7+
## Chore description
8+
9+
<!-- Describe the chore details and why it's needed. -->
10+
11+
12+
### Labels
13+
<!-- Please include labels below by uncommenting them to help us better triage issues -->
14+
15+
<!-- /area frontend -->
16+
<!-- /area backend -->
17+
<!-- /area sdk -->
18+
<!-- /area testing -->
19+
<!-- /area samples -->
20+
<!-- /area components -->
21+
22+
---
23+
24+
<!-- Don't delete the message below to encourage users to support your issue! -->
25+
Love this idea? Give it a 👍.

‎.github/OWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
approvers:
2+
- hbelmiro
3+
- DharmitD
4+
reviewers:
5+
- rimolive

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: "Set up KFP on KinD"
2+
description: "Step to start and configure KFP on KinD"
3+
4+
inputs:
5+
k8s_version:
6+
description: "The Kubernetes version to use for the Kind cluster"
7+
required: true
8+
9+
runs:
10+
using: "composite"
11+
steps:
12+
- name: Create k8s Kind Cluster
13+
uses: container-tools/kind-action@v2
14+
with:
15+
cluster_name: kfp
16+
kubectl_version: ${{ inputs.k8s_version }}
17+
version: v0.25.0
18+
node_image: kindest/node:${{ inputs.k8s_version }}
19+
20+
- name: Build images
21+
shell: bash
22+
run: ./.github/resources/scripts/build-images.sh
23+
24+
- name: Deploy KFP
25+
shell: bash
26+
run: ./.github/resources/scripts/deploy-kfp.sh

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: "Set up KFP Tekton on KinD"
2+
description: "Step to start and configure KFP on KinD"
3+
4+
runs:
5+
using: "composite"
6+
steps:
7+
- name: Create k8s Kind Cluster
8+
uses: container-tools/kind-action@v2
9+
with:
10+
cluster_name: kfp
11+
kubectl_version: v1.29.2
12+
version: v0.22.0
13+
node_image: kindest/node:v1.29.2
14+
15+
- name: Build images
16+
shell: bash
17+
run: ./.github/resources/scripts/build-images.sh
18+
19+
- name: Deploy KFP
20+
shell: bash
21+
run: ./.github/resources/scripts/deploy-kfp-tekton.sh

‎.github/pull_request_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33

44
**Checklist:**
5+
- [ ] You have [signed off your commits](https://www.kubeflow.org/docs/about/contributing/#sign-off-your-commits)
56
- [ ] The title for your pull request (PR) should follow our title convention. [Learn more about the pull request title convention used in this repository](https://github.com/kubeflow/pipelines/blob/master/CONTRIBUTING.md#pull-request-title-convention).
67
<!--
78
PR titles examples:

‎.github/resources/manifests/argo/kustomization.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
patchesStrategicMerge:
19+
- overlays/apiserver-env.yaml

‎.github/resources/manifests/argo/overlays/apiserver-env.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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

‎scripts/deploy/github/manifests/kustomization.yaml renamed to ‎.github/resources/manifests/tekton/kustomization.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ resources:
1414
# when application is deleted.
1515

1616
images:
17-
- name: gcr.io/ml-pipeline/api-server
17+
- name: ghcr.io/kubeflow/kfp-api-server
1818
newName: kind-registry:5000/apiserver
1919
newTag: latest
20-
- name: gcr.io/ml-pipeline/persistenceagent
20+
- name: ghcr.io/kubeflow/kfp-persistence-agent
2121
newName: kind-registry:5000/persistenceagent
2222
newTag: latest
23-
- name: gcr.io/ml-pipeline/scheduledworkflow
23+
- name: ghcr.io/kubeflow/kfp-scheduled-workflow-controller
2424
newName: kind-registry:5000/scheduledworkflow
2525
newTag: latest
2626
- name: '*/aipipeline/tekton-exithandler-controller'

‎.github/resources/scripts/build-images.sh

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#!/bin/bash
2+
#
3+
# Copyright 2023 kubeflow.org
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
# source: https://raw.githubusercontent.com/open-toolchain/commons/master/scripts/check_registry.sh
17+
18+
# Remove the x if you need no print out of each command
19+
set -e
20+
21+
REGISTRY="${REGISTRY:-kind-registry:5000}"
22+
echo "REGISTRY=$REGISTRY"
23+
TAG="${TAG:-latest}"
24+
EXIT_CODE=0
25+
26+
docker system prune -a -f
27+
28+
docker build --progress=plain -t "${REGISTRY}/apiserver:${TAG}" -f backend/Dockerfile . && docker push "${REGISTRY}/apiserver:${TAG}" || EXIT_CODE=$?
29+
if [[ $EXIT_CODE -ne 0 ]]
30+
then
31+
echo "Failed to build apiserver image."
32+
exit $EXIT_CODE
33+
fi
34+
35+
docker build --progress=plain -t "${REGISTRY}/persistenceagent:${TAG}" -f backend/Dockerfile.persistenceagent . && docker push "${REGISTRY}/persistenceagent:${TAG}" || EXIT_CODE=$?
36+
if [[ $EXIT_CODE -ne 0 ]]
37+
then
38+
echo "Failed to build persistenceagent image."
39+
exit $EXIT_CODE
40+
fi
41+
42+
docker build --progress=plain -t "${REGISTRY}/scheduledworkflow:${TAG}" -f backend/Dockerfile.scheduledworkflow . && docker push "${REGISTRY}/scheduledworkflow:${TAG}" || EXIT_CODE=$?
43+
if [[ $EXIT_CODE -ne 0 ]]
44+
then
45+
echo "Failed to build scheduledworkflow image."
46+
exit $EXIT_CODE
47+
fi
48+
49+
docker build --progress=plain -t "${REGISTRY}/driver:${TAG}" -f backend/Dockerfile.driver . && docker push "${REGISTRY}/driver:${TAG}" || EXIT_CODE=$?
50+
if [[ $EXIT_CODE -ne 0 ]]
51+
then
52+
echo "Failed to build driver image."
53+
exit $EXIT_CODE
54+
fi
55+
56+
docker build --progress=plain -t "${REGISTRY}/launcher:${TAG}" -f backend/Dockerfile.launcher . && docker push "${REGISTRY}/launcher:${TAG}" || EXIT_CODE=$?
57+
if [[ $EXIT_CODE -ne 0 ]]
58+
then
59+
echo "Failed to build launcher image."
60+
exit $EXIT_CODE
61+
fi
62+
63+
# clean up intermittent build caches to free up disk space
64+
docker system prune -a -f

0 commit comments

Comments
 (0)