Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update triggers to use v1beta1 and bump triggers, pipeline, knative and k8s version #388

Merged
merged 1 commit into from
Sep 3, 2021
Merged

Update triggers to use v1beta1 and bump triggers, pipeline, knative and k8s version #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion cmd/kubernetes/proxy-webhook/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@ package main

import (
"github.com/tektoncd/operator/pkg/reconciler/proxy"
"knative.dev/pkg/injection"
"knative.dev/pkg/injection/sharedmain"
"knative.dev/pkg/webhook/certificates"
)

func main() {
sharedmain.WebhookMainWithConfig(proxy.Getctx(), "webhook-operator",
sharedmain.ParseAndGetConfigOrDie(),
injection.ParseAndGetRESTConfigOrDie(),
certificates.NewController,
proxy.NewProxyDefaultingAdmissionController,
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/openshift/proxy-webhook/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/tektoncd/operator/pkg/reconciler/proxy"
"knative.dev/pkg/configmap"
"knative.dev/pkg/controller"
"knative.dev/pkg/injection"
"knative.dev/pkg/injection/sharedmain"
"knative.dev/pkg/webhook/certificates"
)
Expand All @@ -49,7 +50,7 @@ func newAnnotationDefaultingAdmissionController(ctx context.Context, cmw configm

func main() {
sharedmain.WebhookMainWithConfig(proxy.Getctx(), "webhook-operator",
sharedmain.ParseAndGetConfigOrDie(),
injection.ParseAndGetRESTConfigOrDie(),
certificates.NewController,
proxy.NewProxyDefaultingAdmissionController,
newAnnotationDefaultingAdmissionController,
Expand Down
24 changes: 12 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ module github.com/tektoncd/operator

require (
github.com/go-logr/zapr v0.4.0
github.com/google/go-cmp v0.5.5
github.com/google/go-cmp v0.5.6
github.com/manifestival/client-go-client v0.5.0
github.com/manifestival/controller-runtime-client v0.4.0
github.com/manifestival/manifestival v0.7.0
github.com/markbates/inflect v1.0.4
github.com/tektoncd/pipeline v0.24.1
github.com/tektoncd/pipeline v0.27.3
github.com/tektoncd/plumbing v0.0.0-20210514044347-f8a9689d5bd5
github.com/tektoncd/triggers v0.14.1
go.uber.org/zap v1.16.0
golang.org/x/mod v0.4.1
gomodules.xyz/jsonpatch/v2 v2.1.0
github.com/tektoncd/triggers v0.16.0
go.uber.org/zap v1.19.0
golang.org/x/mod v0.5.0
gomodules.xyz/jsonpatch/v2 v2.2.0
gotest.tools v2.2.0+incompatible
gotest.tools/v3 v3.0.3
k8s.io/api v0.19.7
k8s.io/apiextensions-apiserver v0.19.7
k8s.io/apimachinery v0.19.7
k8s.io/client-go v0.19.7
k8s.io/code-generator v0.19.7
knative.dev/pkg v0.0.0-20210331065221-952fdd90dbb0
k8s.io/api v0.21.4
k8s.io/apiextensions-apiserver v0.21.4
k8s.io/apimachinery v0.21.4
k8s.io/client-go v0.21.4
k8s.io/code-generator v0.21.4
knative.dev/pkg v0.0.0-20210827184538-2bd91f75571c
sigs.k8s.io/controller-runtime v0.7.2
)

Expand Down
664 changes: 623 additions & 41 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions hack/update-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ source $(git rev-parse --show-toplevel)/vendor/github.com/tektoncd/plumbing/scri
cd ${REPO_ROOT_DIR}

VERSION="release-0.22"
K8S_VERSION="v0.19.7"
TRIGGERS_VERSION="v0.14.1"
PIPELINE_VERSION="v0.24.1"
K8S_VERSION="v0.21.4"
TRIGGERS_VERSION="v0.16.0"
PIPELINE_VERSION="v0.27.3"

# The list of dependencies that we track at HEAD and periodically
# float forward in this repository.
Expand Down
Loading