Skip to content

Commit c0fc071

Browse files
Merge pull request opendatahub-io#89 from DharmitD/rebase-v1.5.1
Rebase kfp-tekton v1.5.1
2 parents ad67f6a + 858d2e6 commit c0fc071

File tree

26 files changed

+10294
-42
lines changed

26 files changed

+10294
-42
lines changed

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.4.0
19+
KFP_TEKTON_RELEASE ?= v1.5.1
2020
export VIRTUAL_ENV := $(abspath ${VENV})
2121
export PATH := ${VIRTUAL_ENV}/bin:${PATH}
2222
DOCKER_REGISTRY ?= aipipeline

VERSION

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

backend/src/apiserver/model/db_status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
package model
1616

1717
type DBStatus struct {
18-
HaveSamplesLoaded bool `gorm:"column:HaveSamplesLoaded; not null"`
18+
HaveSamplesLoaded bool `gorm:"column:HaveSamplesLoaded; not null; primary_key"`
1919
}

backend/src/apiserver/model/default_experiment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
package model
1616

1717
type DefaultExperiment struct {
18-
DefaultExperimentId string `gorm:"column:DefaultExperimentId; not null"`
18+
DefaultExperimentId string `gorm:"column:DefaultExperimentId; not null; primary_key"`
1919
}

backend/src/cache/server/mutation.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,9 @@ func mutateContainer(results map[string][]*tektonv1beta1.TaskRunResult, original
295295
return originalContainer, fmt.Errorf("could not find cached output for container %s", originalContainer.Name)
296296
}
297297
args := []string{}
298-
args = append(args, "printf 'This step output is taken from cache.\n\n'")
298+
args = append(args, "printf '%s' 'This step output is taken from cache.\n\n'")
299299
for _, result := range outputs {
300-
arg := fmt.Sprintf("printf '%s: %s\n'; printf '%s' > /tekton/results/%s", result.Name, result.Value.StringVal, result.Value.StringVal, result.Name)
300+
arg := fmt.Sprintf("printf '%%s' '%s: %s\n'; printf '%%s' '%s' > /tekton/results/%s", result.Name, result.Value.StringVal, result.Value.StringVal, result.Name)
301301
args = append(args, arg)
302302
}
303303

guides/kfp_tekton_install.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
## Installation Targets and Prerequisites
1616

17-
A Kubernetes cluster `v1.22` that has least 8 vCPU and 16 GB memory.
17+
A Kubernetes cluster `v1.23` that has least 8 vCPU and 16 GB memory.
1818

1919
### IBM Cloud Kubernetes Service (IKS)
2020

@@ -41,10 +41,10 @@ A Kubernetes cluster `v1.22` that has least 8 vCPU and 16 GB memory.
4141

4242
To install the standalone Kubeflow Pipelines with Tekton, run the following steps:
4343

44-
1. Install [Tekton v0.38.4](https://github.com/tektoncd/pipeline/blob/v0.38.4/docs/install.md#installing-tekton-pipelines-on-kubernetes) if you don't have Tekton pipelines or OpenShift Pipelines on the cluster. Please be aware that Tekton custom task, loop, and recursion will not work if Tekton/Openshift pipelines version is not v0.28.0+.
44+
1. Install [Tekton v0.41.0](https://github.com/tektoncd/pipeline/blob/v0.41.0/docs/install.md#installing-tekton-pipelines-on-kubernetes) if you don't have Tekton pipelines or OpenShift Pipelines on the cluster. Please be aware that Tekton custom task, loop, and recursion will not work if Tekton/Openshift pipelines version is not v0.28.0+.
4545

4646
```shell
47-
kubectl apply -f https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.38.4/release.yaml
47+
kubectl apply -f https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.41.0/release.yaml
4848
```
4949

5050
2. Enable custom task controller and other feature flags for kfp-tekton
@@ -55,15 +55,15 @@ To install the standalone Kubeflow Pipelines with Tekton, run the following step
5555
-p '{"data":{"default-timeout-minutes": "0"}}'
5656
```
5757

58-
3. Install Kubeflow Pipelines with Tekton backend (`kfp-tekton`) `v1.4.0` [custom resource definitions](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/)(CRDs).
58+
3. Install Kubeflow Pipelines with Tekton backend (`kfp-tekton`) `v1.5.1` [custom resource definitions](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/)(CRDs).
5959
> Note: You can ignore the error `no matches for kind "Application" in version "app.k8s.io/v1beta1"` since it's a warning saying `application` CRD is not yet ready.
6060
```shell
61-
kubectl apply --selector kubeflow/crd-install=true -f install/v1.4.0/kfp-tekton.yaml
61+
kubectl apply --selector kubeflow/crd-install=true -f install/v1.5.1/kfp-tekton.yaml
6262
```
6363

64-
4. Install Kubeflow Pipelines with Tekton backend (`kfp-tekton`) `v1.4.0` deployment
64+
4. Install Kubeflow Pipelines with Tekton backend (`kfp-tekton`) `v1.5.1` deployment
6565
```shell
66-
kubectl apply -f install/v1.4.0/kfp-tekton.yaml
66+
kubectl apply -f install/v1.5.1/kfp-tekton.yaml
6767
```
6868

6969
5. Then, if you want to expose the Kubeflow Pipelines endpoint outside the cluster, run the following commands:

0 commit comments

Comments
 (0)