Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
171 changes: 87 additions & 84 deletions go.mod

Large diffs are not rendered by default.

394 changes: 198 additions & 196 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hack/allocate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion hack/component-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"Serving": "v1.18.1",
"Eventing": "v1.18.2",
"Contour": "v1.18.0",
"Tekton": "v0.56.4",
"Tekton": "v1.1.0",
"Pac": "v0.24.6"
}
2 changes: 1 addition & 1 deletion hack/component-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
tekton_version="v1.1.0"
pac_version="v0.24.6"
}
7 changes: 4 additions & 3 deletions pkg/docker/pusher_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package docker_test

import (
Expand All @@ -13,6 +13,7 @@
"encoding/json"
"errors"
"fmt"
"github.com/docker/docker/client"
"io"
"log"
"math/big"
Expand Down Expand Up @@ -293,11 +294,11 @@
m.negotiateAPIVersion(ctx)
}

func (m *mockPusherDockerClient) ImageSave(ctx context.Context, strings []string) (io.ReadCloser, error) {
func (m *mockPusherDockerClient) ImageSave(ctx context.Context, strings []string, opts ...client.ImageSaveOption) (io.ReadCloser, error) {
return m.imageSave(ctx, strings)
}

func (m *mockPusherDockerClient) ImageLoad(ctx context.Context, reader io.Reader, b bool) (api.LoadResponse, error) {
func (m *mockPusherDockerClient) ImageLoad(ctx context.Context, reader io.Reader, opts ...client.ImageLoadOption) (api.LoadResponse, error) {
panic("implement me")
}

Expand All @@ -313,7 +314,7 @@
return m.imagePush(ctx, ref, options)
}

func (m *mockPusherDockerClient) ImageHistory(context.Context, string) ([]api.HistoryResponseItem, error) {
func (m *mockPusherDockerClient) ImageHistory(context.Context, string, ...client.ImageHistoryOption) ([]api.HistoryResponseItem, error) {
return nil, errors.New("the ImageHistory() function is not implemented")
}

Expand Down
22 changes: 16 additions & 6 deletions pkg/docker/zz_close_guarding_client_generated.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package docker

import (
"context"
"github.com/docker/docker/client"
"io"
"net"
"net/http"
Expand Down Expand Up @@ -460,13 +461,13 @@
return c.pimpl.ImageCreate(arg0, arg1, arg2)
}

func (c *closeGuardingClient) ImageHistory(arg0 context.Context, arg1 string) ([]image.HistoryResponseItem, error) {
func (c *closeGuardingClient) ImageHistory(arg0 context.Context, arg1 string, arg2 ...client.ImageHistoryOption) ([]image.HistoryResponseItem, error) {
c.m.RLock()
defer c.m.RUnlock()
if c.closed {
panic("use of closed client")
}
return c.pimpl.ImageHistory(arg0, arg1)
return c.pimpl.ImageHistory(arg0, arg1, arg2...)
}

func (c *closeGuardingClient) ImageImport(arg0 context.Context, arg1 image.ImportSource, arg2 string, arg3 image.ImportOptions) (io.ReadCloser, error) {
Expand Down Expand Up @@ -496,13 +497,13 @@
return c.pimpl.ImageList(arg0, arg1)
}

func (c *closeGuardingClient) ImageLoad(arg0 context.Context, arg1 io.Reader, arg2 bool) (image.LoadResponse, error) {
func (c *closeGuardingClient) ImageLoad(arg0 context.Context, arg1 io.Reader, arg2 ...client.ImageLoadOption) (image.LoadResponse, error) {
c.m.RLock()
defer c.m.RUnlock()
if c.closed {
panic("use of closed client")
}
return c.pimpl.ImageLoad(arg0, arg1, arg2)
return c.pimpl.ImageLoad(arg0, arg1, arg2...)
}

func (c *closeGuardingClient) ImagePull(arg0 context.Context, arg1 string, arg2 image.PullOptions) (io.ReadCloser, error) {
Expand Down Expand Up @@ -532,13 +533,13 @@
return c.pimpl.ImageRemove(arg0, arg1, arg2)
}

func (c *closeGuardingClient) ImageSave(arg0 context.Context, arg1 []string) (io.ReadCloser, error) {
func (c *closeGuardingClient) ImageSave(arg0 context.Context, arg1 []string, arg2 ...client.ImageSaveOption) (io.ReadCloser, error) {
c.m.RLock()
defer c.m.RUnlock()
if c.closed {
panic("use of closed client")
}
return c.pimpl.ImageSave(arg0, arg1)
return c.pimpl.ImageSave(arg0, arg1, arg2...)
}

func (c *closeGuardingClient) ImageSearch(arg0 context.Context, arg1 string, arg2 registry.SearchOptions) ([]registry.SearchResult, error) {
Expand Down Expand Up @@ -1071,3 +1072,12 @@
}
return c.pimpl.VolumeUpdate(arg0, arg1, arg2, arg3)
}

func (c *closeGuardingClient) ImageInspect(ctx context.Context, image string, opts ...client.ImageInspectOption) (image.InspectResponse, error) {
c.m.RLock()
defer c.m.RUnlock()
if c.closed {
panic("use of closed client")
}
return c.pimpl.ImageInspect(ctx, image, opts...)
}
4 changes: 4 additions & 0 deletions pkg/pipelines/tekton/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions pkg/pipelines/tekton/templates_pack.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -178,11 +178,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
Expand Down
8 changes: 4 additions & 4 deletions pkg/pipelines/tekton/templates_s2i.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -188,11 +188,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
Expand Down
Loading