Skip to content

Commit 99a0740

Browse files
committed
Merge remote-tracking branch 'kubeflow/master' into odh-master
2 parents 6512f57 + fb32672 commit 99a0740

File tree

288 files changed

+9090
-14965
lines changed

Some content is hidden

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

288 files changed

+9090
-14965
lines changed

.github/workflows/kfp-tekton-unittests.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ jobs:
3030
validate-testdata:
3131
runs-on: ubuntu-latest
3232
steps:
33+
- name: Install Go
34+
uses: actions/setup-go@v2
35+
with:
36+
go-version: 1.19.x
3337
- uses: actions/checkout@v2
3438
- name: Set up Python 3.7
3539
uses: actions/setup-python@v2
@@ -91,7 +95,7 @@ jobs:
9195
- name: Install Go
9296
uses: actions/setup-go@v2
9397
with:
94-
go-version: 1.17.x
98+
go-version: 1.19.x
9599
- name: Checkout code
96100
uses: actions/checkout@v2
97101
- name: "run go unit tests"
@@ -104,7 +108,7 @@ jobs:
104108
- name: Install Go
105109
uses: actions/setup-go@v2
106110
with:
107-
go-version: 1.17.x
111+
go-version: 1.19.x
108112
- name: Checkout code
109113
uses: actions/checkout@v2
110114
- name: "run go pipelineLoop unit tests"
@@ -133,6 +137,9 @@ jobs:
133137
uses: container-tools/kind-action@v1
134138
with:
135139
cluster_name: kfp-tekton
140+
kubectl_version: v1.24.7
141+
version: v0.17.0
142+
node_image: kindest/node:v1.24.7
136143
- name: build images
137144
if: ${{ steps.backend-changes.outputs.all }}
138145
run: ./scripts/deploy/github/build-images.sh

.tekton/pipeline.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,29 @@ spec:
653653
workspaces:
654654
- name: task-pvc
655655
workspace: pipeline-pvc
656+
- name: e2e-test-many-edges
657+
retries: 1
658+
taskRef:
659+
name: e2e-test
660+
runAfter:
661+
- deploy
662+
- deploy-pipeline-loops-e2e
663+
params:
664+
- name: apikey
665+
value: $(params.apikey)
666+
- name: kubernetes-cluster
667+
value: $(params.kubernetes-cluster)
668+
- name: kubeflow-ns
669+
value: $(params.kubeflow-ns)
670+
- name: slack-webhook
671+
value: $(params.slack-webhook)
672+
- name: slack-channel
673+
value: $(params.slack-channel)
674+
- name: test-script
675+
value: "scripts/deploy/iks/test-many-edges.sh"
676+
workspaces:
677+
- name: task-pvc
678+
workspace: pipeline-pvc
656679
- name: e2e-test-trusted-ai
657680
retries: 1
658681
taskRef:

.tekton/task.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
mountPath: /artifacts
3636
steps:
3737
- name: run-go-unittests
38-
image: docker.io/aipipeline/pipeline-base-image:1.4
38+
image: docker.io/aipipeline/pipeline-base-image:1.5
3939
env:
4040
- name: DOCKER_USERNAME
4141
value: $(params.docker-username)
@@ -104,7 +104,7 @@ spec:
104104
mountPath: /artifacts
105105
steps:
106106
- name: build-image
107-
image: docker.io/aipipeline/pipeline-base-image:1.4
107+
image: docker.io/aipipeline/pipeline-base-image:1.5
108108
env:
109109
- name: DOCKER_USERNAME
110110
value: $(params.docker-username)
@@ -170,7 +170,7 @@ spec:
170170
mountPath: /artifacts
171171
steps:
172172
- name: build-image
173-
image: docker.io/aipipeline/pipeline-base-image:1.4
173+
image: docker.io/aipipeline/pipeline-base-image:1.5
174174
env:
175175
- name: DOCKER_USERNAME
176176
value: $(params.docker-username)
@@ -240,7 +240,7 @@ spec:
240240
mountPath: /artifacts
241241
steps:
242242
- name: build-image
243-
image: docker.io/aipipeline/pipeline-base-image:1.4
243+
image: docker.io/aipipeline/pipeline-base-image:1.5
244244
env:
245245
- name: DOCKER_USERNAME
246246
value: $(params.docker-username)
@@ -350,7 +350,7 @@ spec:
350350
mountPath: /artifacts
351351
steps:
352352
- name: deploy-kfp-tekton
353-
image: docker.io/aipipeline/pipeline-base-image:1.4
353+
image: docker.io/aipipeline/pipeline-base-image:1.5
354354
env:
355355
- name: DOCKER_USERNAME
356356
value: $(params.docker-username)
@@ -400,7 +400,7 @@ spec:
400400
mountPath: /artifacts
401401
steps:
402402
- name: run-test
403-
image: docker.io/aipipeline/pipeline-base-image:1.4
403+
image: docker.io/aipipeline/pipeline-base-image:1.5
404404
env:
405405
- name: IBM_CLOUD_API_KEY
406406
value: $(params.apikey)
@@ -472,7 +472,7 @@ spec:
472472
mountPath: /artifacts
473473
steps:
474474
- name: publish-images-to-dockerhub
475-
image: docker.io/aipipeline/pipeline-base-image:1.4
475+
image: docker.io/aipipeline/pipeline-base-image:1.5
476476
env:
477477
- name: IBM_CLOUD_API_KEY
478478
value: $(params.apikey)
@@ -577,7 +577,7 @@ spec:
577577
mountPath: /artifacts
578578
steps:
579579
- name: undeploy-kfp-tekton
580-
image: docker.io/aipipeline/pipeline-base-image:1.4
580+
image: docker.io/aipipeline/pipeline-base-image:1.5
581581
env:
582582
- name: PIPELINE_KUBERNETES_CLUSTER_NAME
583583
value: $(params.kubernetes-cluster)
@@ -607,7 +607,7 @@ spec:
607607
mountPath: /artifacts
608608
steps:
609609
- name: build-binaries
610-
image: docker.io/aipipeline/pipeline-base-image:1.4
610+
image: docker.io/aipipeline/pipeline-base-image:1.5
611611
env:
612612
- name: BUILD_DIR
613613
value: $(params.build-dir)
@@ -629,7 +629,7 @@ spec:
629629
mountPath: /artifacts
630630
steps:
631631
- name: setup-deploy
632-
image: docker.io/aipipeline/pipeline-base-image:1.4
632+
image: docker.io/aipipeline/pipeline-base-image:1.5
633633
command:
634634
- /bin/bash
635635
- '-c'
@@ -651,7 +651,7 @@ spec:
651651
mountPath: /artifacts
652652
steps:
653653
- name: setup-deploy
654-
image: docker.io/aipipeline/pipeline-base-image:1.4
654+
image: docker.io/aipipeline/pipeline-base-image:1.5
655655
command:
656656
- /bin/bash
657657
- '-c'
@@ -694,7 +694,7 @@ spec:
694694
mountPath: /artifacts
695695
steps:
696696
- name: iks-script
697-
image: docker.io/aipipeline/pipeline-base-image:1.4
697+
image: docker.io/aipipeline/pipeline-base-image:1.5
698698
env:
699699
- name: IBM_CLOUD_API_KEY
700700
value: $(params.apikey)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# - The help target was derived from https://stackoverflow.com/a/35730328/5601796
1717

1818
VENV ?= .venv
19-
KFP_TEKTON_RELEASE ?= v1.3.1
19+
KFP_TEKTON_RELEASE ?= v1.4.0
2020
export VIRTUAL_ENV := $(abspath ${VENV})
2121
export PATH := ${VIRTUAL_ENV}/bin:${PATH}
2222
DOCKER_REGISTRY ?= aipipeline

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ For more details about the project please follow this detailed [blog post](https
1515
## Architecture
1616

1717
We are currently using [Kubeflow Pipelines 1.8.4](https://github.com/kubeflow/pipelines/releases/tag/1.8.4) and
18-
[Tekton >= 0.38.3](https://github.com/tektoncd/pipeline/releases/tag/v0.38.3)
18+
[Tekton >= 0.41.0](https://github.com/tektoncd/pipeline/releases/tag/v0.41.0)
1919
for this project.
2020

2121
![kfp-tekton](images/kfp-tekton.png)

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.1
1+
1.4.0

backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# limitations under the License.
1717

1818
# 1. Build api server application
19-
FROM golang:1.17.6-stretch as builder
19+
FROM golang:1.19.3-buster as builder
2020
RUN apt-get update && apt-get install -y cmake clang musl-dev openssl
2121
WORKDIR /go/src/github.com/kubeflow/pipelines
2222
COPY . .

backend/Dockerfile.cacheserver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Dockerfile for building the source code of cache_server
16-
FROM golang:1.17.6-alpine3.15 as builder
16+
FROM golang:1.19.3-alpine3.15 as builder
1717

1818
RUN apk update && apk upgrade && \
1919
apk add --no-cache bash git openssh gcc musl-dev

backend/Dockerfile.persistenceagent

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
FROM golang:1.17.6-alpine3.15 as builder
17+
FROM golang:1.19.3-alpine3.15 as builder
1818

1919
WORKDIR /go/src/github.com/kubeflow/pipelines
2020
COPY . .
@@ -48,4 +48,7 @@ ENV TTL_SECONDS_AFTER_WORKFLOW_FINISH 86400
4848
# NUM_WORKERS indicates now many worker goroutines
4949
ENV NUM_WORKERS 2
5050

51-
CMD persistence_agent --logtostderr=true --namespace=${NAMESPACE} --ttlSecondsAfterWorkflowFinish=${TTL_SECONDS_AFTER_WORKFLOW_FINISH} --numWorker ${NUM_WORKERS}
51+
#CHILDREFERENCESKIND kind of runs to search for the childReferences
52+
ENV CHILDREFERENCES_KINDS ""
53+
54+
CMD persistence_agent --logtostderr=true --namespace=${NAMESPACE} --ttlSecondsAfterWorkflowFinish=${TTL_SECONDS_AFTER_WORKFLOW_FINISH} --numWorker ${NUM_WORKERS} --childReferencesKinds ${CHILDREFERENCES_KINDS}

backend/Dockerfile.scheduledworkflow

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.17.6-alpine3.15 as builder
15+
FROM golang:1.19.3-alpine3.15 as builder
1616

1717
WORKDIR /go/src/github.com/kubeflow/pipelines
1818
COPY . .

0 commit comments

Comments
 (0)