Upgrade to controller-runtime 0.16.2 to track DWS (#11)

Signed-off-by: Dean Roehrich <[email protected]>
DataWorkflowServices · Oct 11, 2023 · e0ada95 · e0ada95
1 parent d78b0a6
commit e0ada95
Show file tree

Hide file tree

Showing 664 changed files with 54,156 additions and 27,688 deletions.
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -38,6 +38,7 @@ import (
 	//"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	zapcr "sigs.k8s.io/controller-runtime/pkg/log/zap"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	//+kubebuilder:scaffold:imports
 
@@ -110,10 +111,12 @@ var _ = BeforeSuite(func() {
 	// start webhook server using Manager
 	webhookInstallOptions := &testEnv.WebhookInstallOptions
 	k8sManager, err := ctrl.NewManager(cfg, ctrl.Options{
-		Scheme:  scheme.Scheme,
-		Host:    webhookInstallOptions.LocalServingHost,
-		Port:    webhookInstallOptions.LocalServingPort,
-		CertDir: webhookInstallOptions.LocalServingCertDir,
+		Scheme: scheme.Scheme,
+		WebhookServer: webhook.NewServer(webhook.Options{
+			Host:    webhookInstallOptions.LocalServingHost,
+			Port:    webhookInstallOptions.LocalServingPort,
+			CertDir: webhookInstallOptions.LocalServingCertDir,
+		}),
 	})
 	Expect(err).NotTo(HaveOccurred())
 

diff --git a/go.mod b/go.mod
@@ -3,18 +3,18 @@ module github.com/DataWorkflowServices/dws-test-driver
 go 1.19
 
 require (
-	github.com/DataWorkflowServices/dws v0.0.13
+	github.com/DataWorkflowServices/dws v0.0.1-0.20231010162938-b6d65b00cad6
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-logr/logr v1.2.4
 	github.com/google/go-cmp v0.5.9
 	github.com/google/uuid v1.3.0
 	github.com/onsi/ginkgo/v2 v2.11.0
 	github.com/onsi/gomega v1.27.10
 	go.uber.org/zap v1.25.0
-	k8s.io/api v0.26.1
-	k8s.io/apimachinery v0.26.1
-	k8s.io/client-go v0.26.1
-	sigs.k8s.io/controller-runtime v0.14.5
+	k8s.io/api v0.28.1
+	k8s.io/apimachinery v0.28.1
+	k8s.io/client-go v0.28.1
+	sigs.k8s.io/controller-runtime v0.16.2
 )
 
 require (
@@ -32,7 +32,7 @@ require (
 	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/gnostic v0.6.9 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
@@ -50,6 +50,7 @@ require (
 	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/net v0.14.0 // indirect
 	golang.org/x/oauth2 v0.11.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
@@ -58,16 +59,16 @@ require (
 	golang.org/x/text v0.12.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.9.3 // 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/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.26.1 // indirect
-	k8s.io/component-base v0.26.1 // indirect
+	k8s.io/apiextensions-apiserver v0.28.0 // indirect
+	k8s.io/component-base v0.28.1 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230105215759-76fd588bec96 // indirect
+	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect

diff --git a/go.sum b/go.sum
diff --git a/main.go b/main.go
@@ -31,6 +31,7 @@ import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"github.com/DataWorkflowServices/dws-test-driver/controllers"
 	//+kubebuilder:scaffold:imports
@@ -72,8 +73,7 @@ func main() {
 	setupLog.Info("GOMAXPROCS", "value", runtime.GOMAXPROCS(0))
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
-		MetricsBindAddress:     metricsAddr,
-		Port:                   9443,
+		Metrics:                metricsserver.Options{BindAddress: metricsAddr},
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
 		LeaderElectionID:       "842e30f2.cray.hpe.com",

diff --git a/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/owner_labels.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/owner_labels.go
diff --git a/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_webhook.go
diff --git a/vendor/github.com/google/gnostic/LICENSE → .../github.com/google/gnostic-models/LICENSE b/vendor/github.com/google/gnostic/LICENSE → .../github.com/google/gnostic-models/LICENSE
diff --git a/...hub.com/google/gnostic/compiler/README.md → .../google/gnostic-models/compiler/README.md b/...hub.com/google/gnostic/compiler/README.md → .../google/gnostic-models/compiler/README.md
diff --git a/...ub.com/google/gnostic/compiler/context.go → ...google/gnostic-models/compiler/context.go b/...ub.com/google/gnostic/compiler/context.go → ...google/gnostic-models/compiler/context.go
diff --git a/...thub.com/google/gnostic/compiler/error.go → ...m/google/gnostic-models/compiler/error.go b/...thub.com/google/gnostic/compiler/error.go → ...m/google/gnostic-models/compiler/error.go
diff --git a/...com/google/gnostic/compiler/extensions.go → ...gle/gnostic-models/compiler/extensions.go b/...com/google/gnostic/compiler/extensions.go → ...gle/gnostic-models/compiler/extensions.go
diff --git a/...ub.com/google/gnostic/compiler/helpers.go → ...google/gnostic-models/compiler/helpers.go b/...ub.com/google/gnostic/compiler/helpers.go → ...google/gnostic-models/compiler/helpers.go
diff --git a/...ithub.com/google/gnostic/compiler/main.go → ...om/google/gnostic-models/compiler/main.go b/...ithub.com/google/gnostic/compiler/main.go → ...om/google/gnostic-models/compiler/main.go
diff --git a/...hub.com/google/gnostic/compiler/reader.go → .../google/gnostic-models/compiler/reader.go b/...hub.com/google/gnostic/compiler/reader.go → .../google/gnostic-models/compiler/reader.go
diff --git a/...b.com/google/gnostic/extensions/README.md → ...oogle/gnostic-models/extensions/README.md b/...b.com/google/gnostic/extensions/README.md → ...oogle/gnostic-models/extensions/README.md
diff --git a/...google/gnostic/extensions/extension.pb.go → ...gnostic-models/extensions/extension.pb.go b/...google/gnostic/extensions/extension.pb.go → ...gnostic-models/extensions/extension.pb.go
diff --git a/...google/gnostic/extensions/extension.proto → ...gnostic-models/extensions/extension.proto b/...google/gnostic/extensions/extension.proto → ...gnostic-models/extensions/extension.proto
diff --git a/...m/google/gnostic/extensions/extensions.go → ...e/gnostic-models/extensions/extensions.go b/...m/google/gnostic/extensions/extensions.go → ...e/gnostic-models/extensions/extensions.go
diff --git a/...b.com/google/gnostic/jsonschema/README.md → ...oogle/gnostic-models/jsonschema/README.md b/...b.com/google/gnostic/jsonschema/README.md → ...oogle/gnostic-models/jsonschema/README.md
diff --git a/...hub.com/google/gnostic/jsonschema/base.go → .../google/gnostic-models/jsonschema/base.go b/...hub.com/google/gnostic/jsonschema/base.go → .../google/gnostic-models/jsonschema/base.go
diff --git a/....com/google/gnostic/jsonschema/display.go → ...ogle/gnostic-models/jsonschema/display.go b/....com/google/gnostic/jsonschema/display.go → ...ogle/gnostic-models/jsonschema/display.go
diff --git a/...b.com/google/gnostic/jsonschema/models.go → ...oogle/gnostic-models/jsonschema/models.go b/...b.com/google/gnostic/jsonschema/models.go → ...oogle/gnostic-models/jsonschema/models.go
diff --git a/...m/google/gnostic/jsonschema/operations.go → ...e/gnostic-models/jsonschema/operations.go b/...m/google/gnostic/jsonschema/operations.go → ...e/gnostic-models/jsonschema/operations.go
diff --git a/...b.com/google/gnostic/jsonschema/reader.go → ...oogle/gnostic-models/jsonschema/reader.go b/...b.com/google/gnostic/jsonschema/reader.go → ...oogle/gnostic-models/jsonschema/reader.go
diff --git a/...com/google/gnostic/jsonschema/schema.json → ...gle/gnostic-models/jsonschema/schema.json b/...com/google/gnostic/jsonschema/schema.json → ...gle/gnostic-models/jsonschema/schema.json