Skip to content

Commit a56c128

Browse files
chanwitchanwit
authored
Merge pull request #1207 from akselleirv/rename-repo
rename github.com/weaveworks/tf-controller to github.com/flux-iac/tofu-controller
2 parents 24518c8 + b528d39 commit a56c128

File tree

156 files changed

+269
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+269
-260
lines changed

‎DEVELOPMENT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Running the above will also deploy `source-controller` and its CRDs to the clust
150150

151151
For realtime communications we use Slack: To join the conversation, simply join the [Weave Users](https://weave-community.slack.com/) Slack workspace and use the [#tf-controller](https://weave-community.slack.com/messages/tf-controller/) channel.
152152

153-
To discuss ideas and specifications we use [Github Discussions](https://github.com/weaveworks/tf-controller/discussions).
153+
To discuss ideas and specifications we use [Github Discussions](https://github.com/flux-iac/tofu-controller/discussions).
154154

155155
## Acceptance policy
156156

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
3636

3737
FROM alpine:3.18
3838

39-
LABEL org.opencontainers.image.source="https://github.com/weaveworks/tf-controller"
39+
LABEL org.opencontainers.image.source="https://github.com/flux-iac/tofu-controller"
4040

4141
ARG LIBCRYPTO_VERSION
4242

‎PROJECT

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ domain: contrib.fluxcd.io
22
layout:
33
- go.kubebuilder.io/v3
44
projectName: test-terraform-controller
5-
repo: github.com/weaveworks/tf-controller
5+
repo: github.com/flux-iac/tofu-controller
66
resources:
77
- api:
88
crdVersion: v1
@@ -11,7 +11,7 @@ resources:
1111
domain: contrib.fluxcd.io
1212
group: infra
1313
kind: Terraform
14-
path: github.com/weaveworks/tf-controller/api/v1alpha1
14+
path: github.com/flux-iac/tofu-controller/api/v1alpha1
1515
version: v1alpha1
1616
- api:
1717
crdVersion: v1
@@ -20,6 +20,6 @@ resources:
2020
domain: contrib.fluxcd.io
2121
group: infra
2222
kind: Terraform
23-
path: github.com/weaveworks/tf-controller/api/v1alpha2
23+
path: github.com/flux-iac/tofu-controller/api/v1alpha2
2424
version: v1alpha2
2525
version: "3"

‎SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Our Security Team consists of project maintainers and Weaveworks employees.
2828

2929
### Disclosures
3030

31-
Vulnerability disclosures are announced publicly through our [security advisories](https://github.com/weaveworks/tf-controller/security/advisories).
31+
Vulnerability disclosures are announced publicly through our [security advisories](https://github.com/flux-iac/tofu-controller/security/advisories).
3232
Disclosures will contain an overview, details about the vulnerability, a fix that will typically be an update, and optionally a workaround if one is available.
3333

3434
We will coordinate publishing disclosures and security releases in a way that is realistic and necessary for end users.

‎api/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/weaveworks/tf-controller/api
1+
module github.com/flux-iac/tofu-controller/api
22

33
go 1.19
44

‎api/v1alpha2/terraform_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"time"
2525
"unicode/utf8"
2626

27+
"github.com/flux-iac/tofu-controller/api/planid"
2728
"github.com/fluxcd/pkg/apis/meta"
2829
sourcev1 "github.com/fluxcd/source-controller/api/v1"
29-
"github.com/weaveworks/tf-controller/api/planid"
3030
corev1 "k8s.io/api/core/v1"
3131
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3232
apimeta "k8s.io/apimachinery/pkg/api/meta"

‎cmd/branch-planner/flags.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/fluxcd/pkg/runtime/logger"
99
flag "github.com/spf13/pflag"
1010

11-
"github.com/weaveworks/tf-controller/internal/server/polling"
11+
"github.com/flux-iac/tofu-controller/internal/server/polling"
1212
)
1313

1414
type applicationOptions struct {

‎cmd/branch-planner/informer.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"fmt"
66
"time"
77

8+
tfv1alpha2 "github.com/flux-iac/tofu-controller/api/v1alpha2"
9+
"github.com/flux-iac/tofu-controller/internal/config"
10+
"github.com/flux-iac/tofu-controller/internal/git/provider"
11+
planner "github.com/flux-iac/tofu-controller/internal/informer/branch-planner"
812
"github.com/go-logr/logr"
9-
tfv1alpha2 "github.com/weaveworks/tf-controller/api/v1alpha2"
10-
"github.com/weaveworks/tf-controller/internal/config"
11-
"github.com/weaveworks/tf-controller/internal/git/provider"
12-
planner "github.com/weaveworks/tf-controller/internal/informer/branch-planner"
1313
corev1 "k8s.io/api/core/v1"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/client-go/dynamic"

‎cmd/branch-planner/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"os"
66
"os/signal"
77

8+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
89
"github.com/fluxcd/pkg/runtime/logger"
910
sourcev1 "github.com/fluxcd/source-controller/api/v1"
1011
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
1112
"github.com/go-logr/logr"
12-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1313
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1414
"k8s.io/client-go/kubernetes/scheme"
1515
cgoscheme "k8s.io/client-go/kubernetes/scheme"

‎cmd/branch-planner/polling.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"fmt"
66

7+
"github.com/flux-iac/tofu-controller/internal/server/polling"
78
"github.com/go-logr/logr"
8-
"github.com/weaveworks/tf-controller/internal/server/polling"
99
"sigs.k8s.io/controller-runtime/pkg/client"
1010
)
1111

‎cmd/manager/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ import (
2020
"os"
2121
"time"
2222

23-
"github.com/weaveworks/tf-controller/mtls"
24-
"github.com/weaveworks/tf-controller/runner"
23+
"github.com/flux-iac/tofu-controller/mtls"
24+
"github.com/flux-iac/tofu-controller/runner"
2525

26+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
27+
"github.com/flux-iac/tofu-controller/controllers"
2628
"github.com/fluxcd/pkg/runtime/acl"
2729
"github.com/fluxcd/pkg/runtime/client"
2830
runtimeCtrl "github.com/fluxcd/pkg/runtime/controller"
@@ -34,8 +36,6 @@ import (
3436
sourcev1 "github.com/fluxcd/source-controller/api/v1"
3537
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
3638
flag "github.com/spf13/pflag"
37-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
38-
"github.com/weaveworks/tf-controller/controllers"
3939
"k8s.io/apimachinery/pkg/runtime"
4040
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
4141
clientgoscheme "k8s.io/client-go/kubernetes/scheme"

‎cmd/runner/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"os/signal"
2424
"syscall"
2525

26+
"github.com/flux-iac/tofu-controller/mtls"
2627
"github.com/fluxcd/pkg/runtime/logger"
2728
flag "github.com/spf13/pflag"
28-
"github.com/weaveworks/tf-controller/mtls"
2929
ctrl "sigs.k8s.io/controller-runtime"
3030
)
3131

‎cmd/tfctl/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"os"
66
"strings"
77

8+
"github.com/flux-iac/tofu-controller/tfctl"
89
"github.com/spf13/cobra"
910
"github.com/spf13/viper"
10-
"github.com/weaveworks/tf-controller/tfctl"
1111
"k8s.io/cli-runtime/pkg/genericclioptions"
1212
)
1313

‎controllers/cleaner_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"fmt"
66

7+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
78
"github.com/onsi/gomega"
8-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
99
corev1 "k8s.io/api/core/v1"
1010
apierrors "k8s.io/apimachinery/pkg/api/errors"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎controllers/get_runner_pod_object_key_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package controllers
22

33
import (
4-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
4+
"testing"
5+
6+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
57
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
68
"k8s.io/apimachinery/pkg/types"
7-
"testing"
89

910
. "github.com/onsi/gomega"
1011
)

‎controllers/object_encode_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package controllers
22

33
import (
4+
"testing"
5+
6+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
47
. "github.com/onsi/gomega"
5-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
68
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
7-
"testing"
89
)
910

1011
func TestObjectEncode(t *testing.T) {

‎controllers/suite_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"testing"
3030
"time"
3131

32-
"github.com/weaveworks/tf-controller/mtls"
33-
"github.com/weaveworks/tf-controller/runner"
32+
"github.com/flux-iac/tofu-controller/mtls"
33+
"github.com/flux-iac/tofu-controller/runner"
3434
"k8s.io/apimachinery/pkg/runtime"
3535
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
3636

@@ -39,9 +39,9 @@ import (
3939
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4040
"sigs.k8s.io/cli-utils/pkg/kstatus/polling"
4141

42+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
4243
sourcev1 "github.com/fluxcd/source-controller/api/v1"
4344
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
44-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
4545
"k8s.io/client-go/rest"
4646
ctrl "sigs.k8s.io/controller-runtime"
4747
"sigs.k8s.io/controller-runtime/pkg/client"

‎controllers/tc000010_no_outputs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
. "github.com/onsi/gomega"
1111

12+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1213
sourcev1 "github.com/fluxcd/source-controller/api/v1"
13-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1414
corev1 "k8s.io/api/core/v1"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616
"k8s.io/apimachinery/pkg/types"

‎controllers/tc000011_bad_tar_gz_no_outputs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
. "github.com/onsi/gomega"
1010

11+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1112
sourcev1 "github.com/fluxcd/source-controller/api/v1"
12-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
"k8s.io/apimachinery/pkg/types"
1515
)

‎controllers/tc000011_workspace_no_outputs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
. "github.com/onsi/gomega"
1111

12+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1213
sourcev1 "github.com/fluxcd/source-controller/api/v1"
13-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1414
corev1 "k8s.io/api/core/v1"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616
"k8s.io/apimachinery/pkg/types"

‎controllers/tc000012_src_bucket_no_outputs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"testing"
88
"time"
99

10+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1011
. "github.com/onsi/gomega"
11-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1212

1313
sourcev1 "github.com/fluxcd/source-controller/api/v1"
1414
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"

‎controllers/tc000013_source_not_found_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818

1919
. "github.com/onsi/gomega"
2020

21-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
21+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323
"k8s.io/apimachinery/pkg/types"
2424
)

‎controllers/tc000014_artifact_not_found_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818

1919
. "github.com/onsi/gomega"
2020

21+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
2122
sourcev1 "github.com/fluxcd/source-controller/api/v1"
22-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/apimachinery/pkg/types"
2525
)

‎controllers/tc000015_cliconfigsecret_cross_ns_denied_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
. "github.com/onsi/gomega"
99
"github.com/onsi/gomega/gstruct"
1010

11+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1112
sourcev1 "github.com/fluxcd/source-controller/api/v1"
12-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1313
corev1 "k8s.io/api/core/v1"
1414
"k8s.io/apimachinery/pkg/api/meta"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎controllers/tc000015_depends_on_cross_ns_denied_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
. "github.com/onsi/gomega"
99
"github.com/onsi/gomega/gstruct"
1010

11+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1112
fluxmeta "github.com/fluxcd/pkg/apis/meta"
1213
sourcev1 "github.com/fluxcd/source-controller/api/v1"
13-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1414
"k8s.io/apimachinery/pkg/api/meta"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616
"sigs.k8s.io/controller-runtime/pkg/client"

‎controllers/tc000015_source_cross_ns_denied_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
. "github.com/onsi/gomega"
99
"github.com/onsi/gomega/gstruct"
1010

11+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1112
sourcev1 "github.com/fluxcd/source-controller/api/v1"
12-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1313
"k8s.io/apimachinery/pkg/api/meta"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"sigs.k8s.io/controller-runtime/pkg/client"

‎controllers/tc000016_default_observed_generation_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
. "github.com/onsi/gomega"
99

10-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
10+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
"k8s.io/apimachinery/pkg/util/rand"
1313
"sigs.k8s.io/controller-runtime/pkg/client"

‎controllers/tc000016_finilize_status_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
sourcev1 "github.com/fluxcd/source-controller/api/v1"
1010
. "github.com/onsi/gomega"
1111

12-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
12+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
"k8s.io/apimachinery/pkg/util/rand"
1515
"sigs.k8s.io/controller-runtime/pkg/client"

‎controllers/tc000020_with_backend_no_outputs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"testing"
66
"time"
77

8+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
89
sourcev1 "github.com/fluxcd/source-controller/api/v1"
910
. "github.com/onsi/gomega"
10-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1111
corev1 "k8s.io/api/core/v1"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1313
"k8s.io/apimachinery/pkg/types"

‎controllers/tc000020_with_workspace_no_outputs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"testing"
66
"time"
77

8+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
89
sourcev1 "github.com/fluxcd/source-controller/api/v1"
910
. "github.com/onsi/gomega"
10-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1111
corev1 "k8s.io/api/core/v1"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1313
"k8s.io/apimachinery/pkg/types"

‎controllers/tc000030_plan_only_no_outputs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
. "github.com/onsi/gomega"
1111

12+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1213
sourcev1 "github.com/fluxcd/source-controller/api/v1"
13-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/apimachinery/pkg/types"
1616
)

‎controllers/tc000031_plan_only_with_showplan_as_cm_no_outputs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
. "github.com/onsi/gomega"
1111

12+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1213
sourcev1 "github.com/fluxcd/source-controller/api/v1"
13-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/apimachinery/pkg/types"
1616
)

‎controllers/tc000040_controlled_outputs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
. "github.com/onsi/gomega"
1111

12+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1213
sourcev1 "github.com/fluxcd/source-controller/api/v1"
13-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/apimachinery/pkg/types"
1616
)

‎controllers/tc000041_all_outputs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
. "github.com/onsi/gomega"
1111

12+
infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2"
1213
sourcev1 "github.com/fluxcd/source-controller/api/v1"
13-
infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/apimachinery/pkg/types"
1616
)

0 commit comments

Comments
 (0)