Skip to content

Commit

Permalink
Bump Cluster API to v1.6.0-beta.1
Browse files Browse the repository at this point in the history 
Signed-off-by: killianmuldoon <[email protected]>
  • Loading branch information
@killianmuldoon
killianmuldoon committed Nov 6, 2023
1 parent 450b09f commit 7aa36fa
Show file tree
Hide file tree
Showing 9 changed files with 308 additions and 188 deletions.
2 changes: 1 addition & 1 deletion controllers/servicediscovery_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func AddServiceDiscoveryControllerToManager(ctx context.Context, controllerManag
Mapper: mgr.GetRESTMapper(),
// TODO: Reintroduce the cache sync period
// Resync: ctx.SyncPeriod,
Namespaces: []string{metav1.NamespacePublic},
DefaultNamespaces: map[string]cache.Config{metav1.NamespacePublic: {}},
})
if err != nil {
return errors.Wrapf(err, "failed to create configmap cache")
Expand Down
5 changes: 4 additions & 1 deletion controllers/vmware/test/controllers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
ctrlmgr "sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
vmwarev1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/vmware/v1beta1"
Expand Down Expand Up @@ -215,7 +216,9 @@ func getManager(cfg *rest.Config, networkProvider string) manager.Manager {
opts.SyncPeriod = &syncPeriod
return cache.New(config, opts)
},
MetricsBindAddress: "0",
Metrics: metricsserver.Options{
BindAddress: "0",
},
},
KubeConfig: cfg,
NetworkProvider: networkProvider,
Expand Down
22 changes: 11 additions & 11 deletions controllers/vspheredeploymentzone_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ var _ = Describe("VSphereDeploymentZoneReconciler", func() {
BeforeEach(func() {
vsphereFailureDomain = &infrav1.VSphereFailureDomain{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "blah-fd-",
GenerateName: "blah-1-fd-",
},
Spec: infrav1.VSphereFailureDomainSpec{
Region: infrav1.FailureDomain{
Expand All @@ -104,7 +104,7 @@ var _ = Describe("VSphereDeploymentZoneReconciler", func() {

vsphereDeploymentZone = &infrav1.VSphereDeploymentZone{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "blah-",
GenerateName: "blah2-",
},
Spec: infrav1.VSphereDeploymentZoneSpec{
Server: simr.ServerURL().Host,
Expand Down Expand Up @@ -158,7 +158,7 @@ var _ = Describe("VSphereDeploymentZoneReconciler", func() {
APIVersion: infrav1.GroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
GenerateName: "blah-fd-",
GenerateName: "blah3-fd-",
},
Spec: infrav1.VSphereFailureDomainSpec{
Region: infrav1.FailureDomain{
Expand All @@ -185,7 +185,7 @@ var _ = Describe("VSphereDeploymentZoneReconciler", func() {

vsphereDeploymentZone = &infrav1.VSphereDeploymentZone{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "blah-",
GenerateName: "blah4-",
},
Spec: infrav1.VSphereDeploymentZoneSpec{
Server: simr.ServerURL().Host,
Expand Down Expand Up @@ -331,7 +331,7 @@ func TestVSphereDeploymentZone_Reconcile(t *testing.T) {

vsphereFailureDomain := &infrav1.VSphereFailureDomain{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "blah-fd-",
GenerateName: "blah5-fd-",
},
Spec: infrav1.VSphereFailureDomainSpec{
Region: infrav1.FailureDomain{
Expand All @@ -358,7 +358,7 @@ func TestVSphereDeploymentZone_Reconcile(t *testing.T) {

vsphereDeploymentZone := &infrav1.VSphereDeploymentZone{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "blah-",
GenerateName: "blah6-",
},
Spec: infrav1.VSphereDeploymentZoneSpec{
Server: simr.ServerURL().Host,
Expand Down Expand Up @@ -403,7 +403,7 @@ func TestVSphereDeploymentZone_Reconcile(t *testing.T) {

vsphereFailureDomain := &infrav1.VSphereFailureDomain{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "blah-fd-",
GenerateName: "blah-7fd-",
},
Spec: infrav1.VSphereFailureDomainSpec{
Region: infrav1.FailureDomain{
Expand All @@ -430,7 +430,7 @@ func TestVSphereDeploymentZone_Reconcile(t *testing.T) {

vsphereDeploymentZone := &infrav1.VSphereDeploymentZone{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "blah-",
GenerateName: "blah8-",
},
Spec: infrav1.VSphereDeploymentZoneSpec{
Server: simr.ServerURL().Host,
Expand Down Expand Up @@ -468,7 +468,7 @@ func TestVSphereDeploymentZone_Reconcile(t *testing.T) {

vsphereDeploymentZone := &infrav1.VSphereDeploymentZone{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "blah-",
GenerateName: "blah9-",
},
Spec: infrav1.VSphereDeploymentZoneSpec{
Server: simr.ServerURL().Host,
Expand Down Expand Up @@ -503,7 +503,7 @@ func TestVSphereDeploymentZone_Reconcile(t *testing.T) {

vsphereDeploymentZone := &infrav1.VSphereDeploymentZone{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "blah-",
GenerateName: "blah100-",
},
Spec: infrav1.VSphereDeploymentZoneSpec{
Server: simr.ServerURL().Host,
Expand Down Expand Up @@ -657,7 +657,7 @@ func TestVSphereDeploymentZoneReconciler_ReconcileDelete(t *testing.T) {
Finalizers: []string{infrav1.DeploymentZoneFinalizer},
},
Spec: infrav1.VSphereDeploymentZoneSpec{
FailureDomain: "blah-fd",
FailureDomain: "blah-200fd",
},
}

Expand Down
121 changes: 75 additions & 46 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ module sigs.k8s.io/cluster-api-provider-vsphere

go 1.20

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.2
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.0-beta.1

require (
github.com/blang/semver/v4 v4.0.0
github.com/go-logr/logr v1.3.0
github.com/google/uuid v1.4.0
github.com/onsi/ginkgo/v2 v2.13.0
github.com/onsi/gomega v1.28.1
github.com/onsi/gomega v1.29.0
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.7.0
github.com/stretchr/testify v1.8.4
Expand All @@ -19,56 +19,88 @@ require (
github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20211209213435-0f4ab286f64f
github.com/vmware/govmomi v0.33.1
golang.org/x/crypto v0.14.0
golang.org/x/exp v0.0.0-20221002003631-540bb7301a08
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
golang.org/x/mod v0.13.0
golang.org/x/text v0.13.0
golang.org/x/tools v0.14.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.27.7
k8s.io/apiextensions-apiserver v0.27.7
k8s.io/apimachinery v0.27.7
k8s.io/client-go v0.27.7
k8s.io/cluster-bootstrap v0.27.7
k8s.io/component-base v0.27.7
k8s.io/klog/v2 v2.90.1
k8s.io/utils v0.0.0-20230209194617-a36077c30491
k8s.io/api v0.28.3
k8s.io/apiextensions-apiserver v0.28.3
k8s.io/apimachinery v0.28.3
k8s.io/client-go v0.28.3
k8s.io/cluster-bootstrap v0.28.3
k8s.io/component-base v0.28.3
k8s.io/klog/v2 v2.100.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
sigs.k8s.io/cluster-api/test v1.5.3
sigs.k8s.io/controller-runtime v0.15.3
sigs.k8s.io/cluster-api/test v1.6.0-beta.1
sigs.k8s.io/controller-runtime v0.16.3
sigs.k8s.io/kind v0.20.0
sigs.k8s.io/kustomize/api v0.13.2
sigs.k8s.io/kustomize/kyaml v0.14.1
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
github.com/adrg/xdg v0.4.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-github/v48 v48.2.0 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-github/v53 v53.2.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.24.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
google.golang.org/grpc v1.59.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
k8s.io/kms v0.28.3 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
)

require (
Expand All @@ -79,30 +111,28 @@ require (
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coredns/caddy v1.1.1 // indirect
github.com/coredns/corefile-migration v1.0.21 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v24.0.5+incompatible // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v24.0.6+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gobuffalo/flect v1.0.2 // 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.3 // indirect
github.com/google/cel-go v0.12.7 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
Expand All @@ -123,29 +153,28 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.16.0 // indirect
github.com/spf13/viper v1.17.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/valyala/fastjson v1.6.4 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/fsnotify.v1 v1.4.7
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.27.7 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/apiserver v0.28.3 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Loading

0 comments on commit 7aa36fa

Please sign in to comment.