Skip to content

Commit

Permalink
Merge pull request #443 from fluxcd/flux2-v2-rc1
Browse files Browse the repository at this point in the history
Update Flux to v2.0.0-rc.1
  • Loading branch information
phillebaba authored Apr 6, 2023
2 parents f50e5ec + 153a9a0 commit a1e9392
Show file tree
Hide file tree
Showing 12 changed files with 177 additions and 159 deletions.
2 changes: 1 addition & 1 deletion docs/data-sources/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ data "flux_install" "main" {
- `network_policy` (Boolean) Deny ingress access to the toolkit controllers from other namespaces using network policies. Defaults to `true`.
- `registry` (String) Container registry where the toolkit images are published. Defaults to `ghcr.io/fluxcd`.
- `toleration_keys` (Set of String) List of toleration keys used to schedule the components pods onto nodes with matching taints.
- `version` (String) Flux version. Defaults to `v0.41.2`.
- `version` (String) Flux version. Defaults to `v2.0.0-rc.1`.
- `watch_all_namespaces` (Boolean) If true watch for custom resources in all namespaces. Defaults to `true`.

### Read-Only
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/bootstrap_git.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ resource "flux_bootstrap_git" "this" {
- `secret_name` (String) Name of the secret the sync credentials can be found in or stored to. Defaults to `flux-system`.
- `timeouts` (Attributes) (see [below for nested schema](#nestedatt--timeouts))
- `toleration_keys` (Set of String) List of toleration keys used to schedule the components pods onto nodes with matching taints.
- `version` (String) Flux version. Defaults to `v0.41.2`.
- `version` (String) Flux version. Defaults to `v2.0.0-rc.1`.
- `watch_all_namespaces` (Boolean) If true watch for custom resources in all namespaces. Defaults to `true`.

### Read-Only
Expand Down
73 changes: 36 additions & 37 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1

require (
code.gitea.io/sdk/gitea v0.15.1
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8
github.com/docker/docker v20.10.20+incompatible
github.com/ProtonMail/go-crypto v0.0.0-20230331115716-d34776aa93ec
github.com/docker/docker v23.0.3+incompatible
github.com/docker/go-connections v0.4.0
github.com/fluxcd/flux2 v0.41.2
github.com/fluxcd/helm-controller/api v0.31.2
github.com/fluxcd/image-automation-controller/api v0.31.0
github.com/fluxcd/image-reflector-controller/api v0.26.1
github.com/fluxcd/kustomize-controller/api v0.35.1
github.com/fluxcd/notification-controller/api v0.33.0
github.com/fluxcd/flux2/v2 v2.0.0-rc.1
github.com/fluxcd/helm-controller/api v0.32.1
github.com/fluxcd/image-automation-controller/api v0.32.0
github.com/fluxcd/image-reflector-controller/api v0.27.0
github.com/fluxcd/kustomize-controller/api v1.0.0-rc.1
github.com/fluxcd/notification-controller/api v1.0.0-rc.1
github.com/fluxcd/pkg/git v0.11.0
github.com/fluxcd/pkg/git/gogit v0.8.1
github.com/fluxcd/pkg/runtime v0.31.0
github.com/fluxcd/pkg/ssa v0.24.1
github.com/fluxcd/pkg/runtime v0.35.0
github.com/fluxcd/pkg/ssa v0.27.0
github.com/fluxcd/pkg/ssh v0.7.3
github.com/fluxcd/source-controller/api v0.36.1
github.com/google/go-containerregistry v0.13.0
github.com/fluxcd/source-controller/api v1.0.0-rc.1
github.com/google/go-containerregistry v0.14.0
github.com/hashicorp/terraform-plugin-docs v0.13.0
github.com/hashicorp/terraform-plugin-framework v1.2.0
github.com/hashicorp/terraform-plugin-framework-timeouts v0.3.1
Expand All @@ -39,13 +39,13 @@ require (
github.com/hashicorp/terraform-plugin-testing v1.1.0
github.com/mitchellh/go-homedir v1.1.0
github.com/stretchr/testify v1.8.2
k8s.io/api v0.26.2
k8s.io/apiextensions-apiserver v0.26.2
k8s.io/apimachinery v0.26.2
k8s.io/cli-runtime v0.26.2
k8s.io/client-go v0.26.2
k8s.io/api v0.26.3
k8s.io/apiextensions-apiserver v0.26.3
k8s.io/apimachinery v0.26.3
k8s.io/cli-runtime v0.26.3
k8s.io/client-go v0.26.3
sigs.k8s.io/cli-utils v0.34.0
sigs.k8s.io/controller-runtime v0.14.5
sigs.k8s.io/controller-runtime v0.14.6
sigs.k8s.io/kind v0.17.0
sigs.k8s.io/kustomize/api v0.12.1
sigs.k8s.io/yaml v1.3.0
Expand Down Expand Up @@ -79,26 +79,26 @@ require (
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fluxcd/go-git-providers v0.14.0 // indirect
github.com/fluxcd/go-git-providers v0.15.0 // indirect
github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4 // indirect
github.com/fluxcd/pkg/apis/acl v0.1.0 // indirect
github.com/fluxcd/pkg/apis/kustomize v0.8.1 // indirect
github.com/fluxcd/pkg/apis/meta v0.19.1 // indirect
github.com/fluxcd/pkg/kustomize v0.13.2 // indirect
github.com/fluxcd/pkg/apis/kustomize v1.0.0 // indirect
github.com/fluxcd/pkg/apis/meta v1.0.0 // indirect
github.com/fluxcd/pkg/kustomize v1.1.1 // indirect
github.com/fluxcd/pkg/untar v0.2.0 // indirect
github.com/fluxcd/pkg/version v0.2.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.4.1 // indirect
github.com/go-git/go-git/v5 v5.5.1 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
Expand Down Expand Up @@ -137,7 +137,7 @@ require (
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/cli v1.1.5 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand Down Expand Up @@ -168,42 +168,41 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/skeema/knownhosts v1.1.0 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.6.1 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
github.com/vmihailenco/tagparser v0.1.2 // indirect
github.com/xanzy/go-gitlab v0.78.0 // indirect
github.com/xanzy/go-gitlab v0.81.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
github.com/zclconf/go-cty v1.13.1 // indirect
go.starlark.net v0.0.0-20221205180719-3fd0dac74452 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/term v0.7.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.6.0 // indirect
golang.org/x/tools v0.7.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect
google.golang.org/grpc v1.51.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/protobuf v1.29.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.26.2 // indirect
k8s.io/component-base v0.26.3 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
k8s.io/kubectl v0.26.2 // indirect
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
k8s.io/kubectl v0.26.3 // indirect
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/kyaml v0.13.10 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand Down
Loading

0 comments on commit a1e9392

Please sign in to comment.