diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 76f2b8ee..1ad6c86f 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -19,9 +19,9 @@ builds: - goos: linux goarch: arm64 ldflags: > - -X github.com/gocardless/theatre/v3/cmd.Version={{.Version}} - -X github.com/gocardless/theatre/v3/cmd.Commit={{.Commit}} - -X github.com/gocardless/theatre/v3/cmd.Date={{.Date}} + -X github.com/gocardless/theatre/v4/cmd.Version={{.Version}} + -X github.com/gocardless/theatre/v4/cmd.Commit={{.Commit}} + -X github.com/gocardless/theatre/v4/cmd.Date={{.Date}} -a -installsuffix cgo env: diff --git a/Makefile b/Makefile index ba60fa8e..99adb744 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ IMAGE=eu.gcr.io/gc-containers/gocardless/theatre VERSION=$(shell git describe --tags --dirty --long) GIT_REVISION=$(shell git rev-parse HEAD) DATE=$(shell date +"%Y%m%d.%H%M%S") -LDFLAGS=-ldflags "-s -X github.com/gocardless/theatre/v3/cmd.Version=$(VERSION) -X github.com/gocardless/theatre/v3/cmd.Commit=$(GIT_REVISION) -X github.com/gocardless/theatre/v3/cmd.Date=$(DATE)" +LDFLAGS=-ldflags "-s -X github.com/gocardless/theatre/v4/cmd.Version=$(VERSION) -X github.com/gocardless/theatre/v4/cmd.Commit=$(GIT_REVISION) -X github.com/gocardless/theatre/v4/cmd.Date=$(DATE)" BUILD_COMMAND=go build $(LDFLAGS) # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) diff --git a/apis/workloads/v1alpha1/console_attach_webhook.go b/apis/workloads/v1alpha1/console_attach_webhook.go index 0ed776a4..29c4b9c1 100644 --- a/apis/workloads/v1alpha1/console_attach_webhook.go +++ b/apis/workloads/v1alpha1/console_attach_webhook.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/gocardless/theatre/v3/pkg/logging" + "github.com/gocardless/theatre/v4/pkg/logging" ) // +kubebuilder:object:generate=false diff --git a/apis/workloads/v1alpha1/console_authorisation_webhook.go b/apis/workloads/v1alpha1/console_authorisation_webhook.go index b97d085a..27416861 100644 --- a/apis/workloads/v1alpha1/console_authorisation_webhook.go +++ b/apis/workloads/v1alpha1/console_authorisation_webhook.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/gocardless/theatre/v3/pkg/logging" - rbacutils "github.com/gocardless/theatre/v3/pkg/rbac" + "github.com/gocardless/theatre/v4/pkg/logging" + rbacutils "github.com/gocardless/theatre/v4/pkg/rbac" ) // +kubebuilder:object:generate=false diff --git a/apis/workloads/v1alpha1/lifecycle_recorder.go b/apis/workloads/v1alpha1/lifecycle_recorder.go index 69e289e5..b61d45ca 100644 --- a/apis/workloads/v1alpha1/lifecycle_recorder.go +++ b/apis/workloads/v1alpha1/lifecycle_recorder.go @@ -8,7 +8,7 @@ import ( "time" "github.com/go-logr/logr" - "github.com/gocardless/theatre/v3/pkg/workloads/console/events" + "github.com/gocardless/theatre/v4/pkg/workloads/console/events" "github.com/prometheus/client_golang/prometheus" "golang.org/x/sys/unix" corev1 "k8s.io/api/core/v1" diff --git a/cmd/acceptance/main.go b/cmd/acceptance/main.go index 744035fa..661edfd6 100644 --- a/cmd/acceptance/main.go +++ b/cmd/acceptance/main.go @@ -23,10 +23,10 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/klog" - "github.com/gocardless/theatre/v3/pkg/signals" + "github.com/gocardless/theatre/v4/pkg/signals" - vaultManagerAcceptance "github.com/gocardless/theatre/v3/cmd/vault-manager/acceptance" - workloadsManagerAcceptance "github.com/gocardless/theatre/v3/cmd/workloads-manager/acceptance" + vaultManagerAcceptance "github.com/gocardless/theatre/v4/cmd/vault-manager/acceptance" + workloadsManagerAcceptance "github.com/gocardless/theatre/v4/cmd/workloads-manager/acceptance" ) var ( diff --git a/cmd/rbac-manager/main.go b/cmd/rbac-manager/main.go index 99fb82e9..8879d9ec 100644 --- a/cmd/rbac-manager/main.go +++ b/cmd/rbac-manager/main.go @@ -16,10 +16,10 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/metrics" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" - "github.com/gocardless/theatre/v3/cmd" - directoryrolebinding "github.com/gocardless/theatre/v3/controllers/rbac/directoryrolebinding" - "github.com/gocardless/theatre/v3/pkg/signals" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" + "github.com/gocardless/theatre/v4/cmd" + directoryrolebinding "github.com/gocardless/theatre/v4/controllers/rbac/directoryrolebinding" + "github.com/gocardless/theatre/v4/pkg/signals" ) var ( diff --git a/cmd/theatre-consoles/main.go b/cmd/theatre-consoles/main.go index 1be58cfd..b9a19ce1 100644 --- a/cmd/theatre-consoles/main.go +++ b/cmd/theatre-consoles/main.go @@ -16,10 +16,10 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/klog" - workloadsv1alpha1 "github.com/gocardless/theatre/v3/apis/workloads/v1alpha1" - "github.com/gocardless/theatre/v3/cmd" - "github.com/gocardless/theatre/v3/pkg/signals" - "github.com/gocardless/theatre/v3/pkg/workloads/console/runner" + workloadsv1alpha1 "github.com/gocardless/theatre/v4/apis/workloads/v1alpha1" + "github.com/gocardless/theatre/v4/cmd" + "github.com/gocardless/theatre/v4/pkg/signals" + "github.com/gocardless/theatre/v4/pkg/workloads/console/runner" ) var ( diff --git a/cmd/theatre-secrets/main.go b/cmd/theatre-secrets/main.go index 3802ce4b..8c5a24ba 100644 --- a/cmd/theatre-secrets/main.go +++ b/cmd/theatre-secrets/main.go @@ -21,8 +21,8 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "github.com/gocardless/theatre/v3/cmd" - "github.com/gocardless/theatre/v3/pkg/signals" + "github.com/gocardless/theatre/v4/cmd" + "github.com/gocardless/theatre/v4/pkg/signals" ) var logger logr.Logger diff --git a/cmd/vault-manager/main.go b/cmd/vault-manager/main.go index f86326e0..bddf5463 100644 --- a/cmd/vault-manager/main.go +++ b/cmd/vault-manager/main.go @@ -11,9 +11,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - vaultv1alpha1 "github.com/gocardless/theatre/v3/apis/vault/v1alpha1" - "github.com/gocardless/theatre/v3/cmd" - "github.com/gocardless/theatre/v3/pkg/signals" + vaultv1alpha1 "github.com/gocardless/theatre/v4/apis/vault/v1alpha1" + "github.com/gocardless/theatre/v4/cmd" + "github.com/gocardless/theatre/v4/pkg/signals" ) var ( diff --git a/cmd/workloads-manager/acceptance/acceptance.go b/cmd/workloads-manager/acceptance/acceptance.go index d38e63da..382bdea3 100644 --- a/cmd/workloads-manager/acceptance/acceptance.go +++ b/cmd/workloads-manager/acceptance/acceptance.go @@ -18,9 +18,9 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" - workloadsv1alpha1 "github.com/gocardless/theatre/v3/apis/workloads/v1alpha1" - "github.com/gocardless/theatre/v3/pkg/workloads/console/runner" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" + workloadsv1alpha1 "github.com/gocardless/theatre/v4/apis/workloads/v1alpha1" + "github.com/gocardless/theatre/v4/pkg/workloads/console/runner" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/cmd/workloads-manager/main.go b/cmd/workloads-manager/main.go index bfdc134b..25ad0492 100644 --- a/cmd/workloads-manager/main.go +++ b/cmd/workloads-manager/main.go @@ -13,12 +13,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" - workloadsv1alpha1 "github.com/gocardless/theatre/v3/apis/workloads/v1alpha1" - "github.com/gocardless/theatre/v3/cmd" - consolecontroller "github.com/gocardless/theatre/v3/controllers/workloads/console" - "github.com/gocardless/theatre/v3/pkg/signals" - "github.com/gocardless/theatre/v3/pkg/workloads/console/events" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" + workloadsv1alpha1 "github.com/gocardless/theatre/v4/apis/workloads/v1alpha1" + "github.com/gocardless/theatre/v4/cmd" + consolecontroller "github.com/gocardless/theatre/v4/controllers/workloads/console" + "github.com/gocardless/theatre/v4/pkg/signals" + "github.com/gocardless/theatre/v4/pkg/workloads/console/events" ) var ( diff --git a/controllers/rbac/directoryrolebinding/controller.go b/controllers/rbac/directoryrolebinding/controller.go index e317c477..e36cbf01 100644 --- a/controllers/rbac/directoryrolebinding/controller.go +++ b/controllers/rbac/directoryrolebinding/controller.go @@ -19,9 +19,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" - rbacutils "github.com/gocardless/theatre/v3/pkg/rbac" - "github.com/gocardless/theatre/v3/pkg/recutil" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" + rbacutils "github.com/gocardless/theatre/v4/pkg/rbac" + "github.com/gocardless/theatre/v4/pkg/recutil" ) const ( diff --git a/controllers/rbac/directoryrolebinding/integration/integration_test.go b/controllers/rbac/directoryrolebinding/integration/integration_test.go index 59da8d5b..31688301 100644 --- a/controllers/rbac/directoryrolebinding/integration/integration_test.go +++ b/controllers/rbac/directoryrolebinding/integration/integration_test.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" "github.com/google/uuid" . "github.com/onsi/ginkgo" diff --git a/controllers/rbac/directoryrolebinding/integration/suite_test.go b/controllers/rbac/directoryrolebinding/integration/suite_test.go index 0eb089aa..04eb74c9 100644 --- a/controllers/rbac/directoryrolebinding/integration/suite_test.go +++ b/controllers/rbac/directoryrolebinding/integration/suite_test.go @@ -17,8 +17,8 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" - directoryrolebinding "github.com/gocardless/theatre/v3/controllers/rbac/directoryrolebinding" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" + directoryrolebinding "github.com/gocardless/theatre/v4/controllers/rbac/directoryrolebinding" ) var ( diff --git a/controllers/workloads/console/controller.go b/controllers/workloads/console/controller.go index f86fe48a..b7c9adc1 100644 --- a/controllers/workloads/console/controller.go +++ b/controllers/workloads/console/controller.go @@ -29,10 +29,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" - workloadsv1alpha1 "github.com/gocardless/theatre/v3/apis/workloads/v1alpha1" - "github.com/gocardless/theatre/v3/pkg/logging" - "github.com/gocardless/theatre/v3/pkg/recutil" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" + workloadsv1alpha1 "github.com/gocardless/theatre/v4/apis/workloads/v1alpha1" + "github.com/gocardless/theatre/v4/pkg/logging" + "github.com/gocardless/theatre/v4/pkg/recutil" ) const ( diff --git a/controllers/workloads/console/integration/integration_test.go b/controllers/workloads/console/integration/integration_test.go index e90473da..edfa4d0b 100644 --- a/controllers/workloads/console/integration/integration_test.go +++ b/controllers/workloads/console/integration/integration_test.go @@ -16,8 +16,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" - workloadsv1alpha1 "github.com/gocardless/theatre/v3/apis/workloads/v1alpha1" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" + workloadsv1alpha1 "github.com/gocardless/theatre/v4/apis/workloads/v1alpha1" ) var _ = Describe("Console", func() { diff --git a/controllers/workloads/console/integration/suite_test.go b/controllers/workloads/console/integration/suite_test.go index b41e7f89..f7e151dd 100644 --- a/controllers/workloads/console/integration/suite_test.go +++ b/controllers/workloads/console/integration/suite_test.go @@ -18,10 +18,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" - workloadsv1alpha1 "github.com/gocardless/theatre/v3/apis/workloads/v1alpha1" - consolecontroller "github.com/gocardless/theatre/v3/controllers/workloads/console" - "github.com/gocardless/theatre/v3/pkg/workloads/console/events" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" + workloadsv1alpha1 "github.com/gocardless/theatre/v4/apis/workloads/v1alpha1" + consolecontroller "github.com/gocardless/theatre/v4/controllers/workloads/console" + "github.com/gocardless/theatre/v4/pkg/workloads/console/events" ) var ( diff --git a/go.mod b/go.mod index 61bd9983..6a3ab6b7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/gocardless/theatre/v3 +module github.com/gocardless/theatre/v4 go 1.19 diff --git a/pkg/recutil/reconcile.go b/pkg/recutil/reconcile.go index bacd9af4..47dbd782 100644 --- a/pkg/recutil/reconcile.go +++ b/pkg/recutil/reconcile.go @@ -16,8 +16,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" - "github.com/gocardless/theatre/v3/pkg/logging" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" + "github.com/gocardless/theatre/v4/pkg/logging" ) const ( diff --git a/pkg/workloads/console/runner/integration/integration_test.go b/pkg/workloads/console/runner/integration/integration_test.go index 0d8f68ee..3ad69371 100644 --- a/pkg/workloads/console/runner/integration/integration_test.go +++ b/pkg/workloads/console/runner/integration/integration_test.go @@ -12,8 +12,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - workloadsv1alpha1 "github.com/gocardless/theatre/v3/apis/workloads/v1alpha1" - "github.com/gocardless/theatre/v3/pkg/workloads/console/runner" + workloadsv1alpha1 "github.com/gocardless/theatre/v4/apis/workloads/v1alpha1" + "github.com/gocardless/theatre/v4/pkg/workloads/console/runner" ) func newNamespace(name string) corev1.Namespace { diff --git a/pkg/workloads/console/runner/integration/suite_test.go b/pkg/workloads/console/runner/integration/suite_test.go index cf370211..7d45b80b 100644 --- a/pkg/workloads/console/runner/integration/suite_test.go +++ b/pkg/workloads/console/runner/integration/suite_test.go @@ -16,8 +16,8 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" - workloadsv1alpha1 "github.com/gocardless/theatre/v3/apis/workloads/v1alpha1" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" + workloadsv1alpha1 "github.com/gocardless/theatre/v4/apis/workloads/v1alpha1" ) var ( diff --git a/pkg/workloads/console/runner/runner.go b/pkg/workloads/console/runner/runner.go index ff154b48..dd01a88f 100644 --- a/pkg/workloads/console/runner/runner.go +++ b/pkg/workloads/console/runner/runner.go @@ -32,8 +32,8 @@ import ( "k8s.io/kubectl/pkg/util/term" "sigs.k8s.io/controller-runtime/pkg/client" - rbacv1alpha1 "github.com/gocardless/theatre/v3/apis/rbac/v1alpha1" - workloadsv1alpha1 "github.com/gocardless/theatre/v3/apis/workloads/v1alpha1" + rbacv1alpha1 "github.com/gocardless/theatre/v4/apis/rbac/v1alpha1" + workloadsv1alpha1 "github.com/gocardless/theatre/v4/apis/workloads/v1alpha1" ) // Alias genericclioptions.IOStreams to avoid additional imports