diff --git a/hack/allocate.sh b/hack/allocate.sh index ad28aef8e..c2dcae3ac 100755 --- a/hack/allocate.sh +++ b/hack/allocate.sh @@ -421,7 +421,7 @@ tekton() { # TODO: Remove this workaround once the underlying Tekton issue is resolved echo "${blue}- Disabling affinity assistant (temporary workaround)${reset}" $KUBECTL patch configmap feature-flags -n tekton-pipelines \ - -p '{"data":{"disable-affinity-assistant":"true"}}' \ + -p '{"data":{"disable-affinity-assistant":"true", "coschedule":"disabled"}}' \ --type=merge echo "${green}✅ Tekton${reset}" diff --git a/hack/component-versions.json b/hack/component-versions.json index f3eeeadd1..44e7a6a4d 100644 --- a/hack/component-versions.json +++ b/hack/component-versions.json @@ -3,6 +3,6 @@ "Serving": "v1.18.1", "Eventing": "v1.18.2", "Contour": "v1.18.0", - "Tekton": "v0.56.4", - "Pac": "v0.24.6" + "Tekton": "v1.1.0", + "Pac": "v0.35.2" } diff --git a/hack/component-versions.sh b/hack/component-versions.sh index 6ecde452b..497bf32e3 100644 --- a/hack/component-versions.sh +++ b/hack/component-versions.sh @@ -14,6 +14,6 @@ set_versions() { knative_serving_version="v1.18.1" knative_eventing_version="v1.18.2" contour_version="v1.18.0" - tekton_version="v0.56.4" - pac_version="v0.24.6" + tekton_version="v1.1.0" + pac_version="v0.35.2" } diff --git a/pkg/pipelines/tekton/templates.go b/pkg/pipelines/tekton/templates.go index 60dda81df..3d22cdeb4 100644 --- a/pkg/pipelines/tekton/templates.go +++ b/pkg/pipelines/tekton/templates.go @@ -36,6 +36,8 @@ const ( value: $(params.gitRepository) - name: revision value: $(params.gitRevision) + - name: gitInitImage + value: ghcr.io/tektoncd/github.com/tektoncd/pipeline/cmd/git-init:v0.21.0 taskRef: kind: Task name: git-clone @@ -49,6 +51,8 @@ const ( value: $(params.gitRepository) - name: revision value: $(params.gitRevision) + - name: gitInitImage + value: ghcr.io/tektoncd/github.com/tektoncd/pipeline/cmd/git-init:v0.21.0 taskRef: resolver: hub params: diff --git a/pkg/pipelines/tekton/templates_pack.go b/pkg/pipelines/tekton/templates_pack.go index 52f2612a6..e9ab0e395 100644 --- a/pkg/pipelines/tekton/templates_pack.go +++ b/pkg/pipelines/tekton/templates_pack.go @@ -115,11 +115,11 @@ metadata: spec: params: - name: gitRepository - value: {{.RepoUrl}} + value: "{{.RepoUrl}}" - name: gitRevision value: {{.Revision}} - name: contextDir - value: {{.ContextDir}} + value: "{{.ContextDir}}" - name: imageName value: {{.FunctionImage}} - name: registry @@ -182,7 +182,7 @@ spec: - name: gitRevision value: {{.Revision}} - name: contextDir - value: {{.ContextDir}} + value: "{{.ContextDir}}" - name: imageName value: {{.FunctionImage}} - name: registry diff --git a/pkg/pipelines/tekton/templates_s2i.go b/pkg/pipelines/tekton/templates_s2i.go index a0d1e9ce9..7315a382b 100644 --- a/pkg/pipelines/tekton/templates_s2i.go +++ b/pkg/pipelines/tekton/templates_s2i.go @@ -120,11 +120,11 @@ metadata: spec: params: - name: gitRepository - value: {{.RepoUrl}} + value: "{{.RepoUrl}}" - name: gitRevision value: {{.Revision}} - name: contextDir - value: {{.ContextDir}} + value: "{{.ContextDir}}" - name: imageName value: {{.FunctionImage}} - name: registry @@ -192,7 +192,7 @@ spec: - name: gitRevision value: {{.Revision}} - name: contextDir - value: {{.ContextDir}} + value: "{{.ContextDir}}" - name: imageName value: {{.FunctionImage}} - name: registry