Skip to content

Commit

Permalink
v3 -> v4
Browse files Browse the repository at this point in the history 
Make the package version match the tagged version.
  • Loading branch information
@benwh
benwh committed Sep 14, 2023
1 parent 26dbade commit ed76aa0
Show file tree
Hide file tree
Showing 23 changed files with 58 additions and 58 deletions.
6 changes: 3 additions & 3 deletions .goreleaser.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion apis/workloads/v1alpha1/console_attach_webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions apis/workloads/v1alpha1/console_authorisation_webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion apis/workloads/v1alpha1/lifecycle_recorder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cmd/acceptance/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
8 changes: 4 additions & 4 deletions cmd/rbac-manager/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
8 changes: 4 additions & 4 deletions cmd/theatre-consoles/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmd/theatre-secrets/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cmd/vault-manager/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions cmd/workloads-manager/acceptance/acceptance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions cmd/workloads-manager/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions controllers/rbac/directoryrolebinding/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion controllers/rbac/directoryrolebinding/integration/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/rbac/directoryrolebinding/integration/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
8 changes: 4 additions & 4 deletions controllers/workloads/console/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions controllers/workloads/console/integration/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions controllers/workloads/console/integration/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/gocardless/theatre/v3
module github.com/gocardless/theatre/v4

go 1.19

Expand Down
4 changes: 2 additions & 2 deletions pkg/recutil/reconcile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions pkg/workloads/console/runner/integration/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/workloads/console/runner/integration/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions pkg/workloads/console/runner/runner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ed76aa0

Please sign in to comment.