Merge pull request #115 from arkadeepsen/ocp-dnsnameresolver

CFE-963: UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin
openshift · Apr 5, 2024 · f937ebf · f937ebf
2 parents 022a053 + 7a9d9ea
commit f937ebf
Show file tree

Hide file tree

Showing 407 changed files with 55,119 additions and 7,069 deletions.
diff --git a/core/dnsserver/zdirectives.go b/core/dnsserver/zdirectives.go
@@ -37,6 +37,7 @@ var Directives = []string{
 	"loadbalance",
 	"tsig",
 	"cache",
+	"ocp_dnsnameresolver",
 	"rewrite",
 	"header",
 	"dnssec",

diff --git a/core/plugin/zplugin.go b/core/plugin/zplugin.go
@@ -56,4 +56,6 @@ import (
 	_ "github.com/coredns/coredns/plugin/tsig"
 	_ "github.com/coredns/coredns/plugin/view"
 	_ "github.com/coredns/coredns/plugin/whoami"
+
+	_ "github.com/openshift/coredns-ocp-dnsnameresolver"
 )
diff --git a/go.mod b/go.mod
@@ -17,6 +17,7 @@ require (
 	github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9
 	github.com/matttproud/golang_protobuf_extensions v1.0.4
 	github.com/miekg/dns v1.1.55
+	github.com/openshift/coredns-ocp-dnsnameresolver v0.0.0-20240326070009-fc0f61729b14
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/openzipkin-contrib/zipkin-go-opentracing v0.5.0
 	github.com/openzipkin/zipkin-go v0.4.2
@@ -33,11 +34,11 @@ require (
 	google.golang.org/grpc v1.57.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/DataDog/dd-trace-go.v1 v1.54.0
-	k8s.io/api v0.27.4
-	k8s.io/apimachinery v0.27.4
-	k8s.io/client-go v0.27.4
+	k8s.io/api v0.28.2
+	k8s.io/apimachinery v0.28.2
+	k8s.io/client-go v0.28.2
 	k8s.io/klog/v2 v2.100.1
-	k8s.io/utils v0.0.0-20230209194617-a36077c30491
+	k8s.io/utils v0.0.0-20230505201702-9f6742963106
 )
 
 require (
@@ -67,18 +68,18 @@ require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/ebitengine/purego v0.5.0-alpha // indirect
 	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // 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/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20230509042627-b1315fad0c5a // indirect
@@ -96,6 +97,8 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/onsi/ginkgo/v2 v2.11.0 // indirect
+	github.com/openshift/api v0.0.0-20231017161003-8f2e18642ccb // indirect
+	github.com/openshift/client-go v0.0.0-20231018150822-6e226e2825a6 // indirect
 	github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
 	github.com/oschwald/maxminddb-golang v1.11.0 // indirect
 	github.com/outcaste-io/ristretto v0.2.1 // indirect
@@ -130,7 +133,7 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	inet.af/netaddr v0.0.0-20220811202034-502d2d690317 // indirect
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // 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
 	sigs.k8s.io/yaml v1.3.0 // indirect

diff --git a/go.sum b/go.sum
diff --git a/plugin.cfg b/plugin.cfg
@@ -46,6 +46,7 @@ chaos:chaos
 loadbalance:loadbalance
 tsig:tsig
 cache:cache
+ocp_dnsnameresolver:github.com/openshift/coredns-ocp-dnsnameresolver
 rewrite:rewrite
 header:header
 dnssec:dnssec

diff --git a/vendor/github.com/evanphx/json-patch/patch.go b/vendor/github.com/evanphx/json-patch/patch.go
diff --git a/vendor/github.com/go-openapi/jsonreference/internal/normalize_url.go b/vendor/github.com/go-openapi/jsonreference/internal/normalize_url.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
diff --git a/...b.com/google/gnostic/jsonschema/writer.go → ...oogle/gnostic-models/jsonschema/writer.go b/...b.com/google/gnostic/jsonschema/writer.go → ...oogle/gnostic-models/jsonschema/writer.go
diff --git a/...com/google/gnostic/openapiv2/OpenAPIv2.go → ...gle/gnostic-models/openapiv2/OpenAPIv2.go b/...com/google/gnostic/openapiv2/OpenAPIv2.go → ...gle/gnostic-models/openapiv2/OpenAPIv2.go
diff --git a/.../google/gnostic/openapiv2/OpenAPIv2.pb.go → .../gnostic-models/openapiv2/OpenAPIv2.pb.go b/.../google/gnostic/openapiv2/OpenAPIv2.pb.go → .../gnostic-models/openapiv2/OpenAPIv2.pb.go
diff --git a/.../google/gnostic/openapiv2/OpenAPIv2.proto → .../gnostic-models/openapiv2/OpenAPIv2.proto b/.../google/gnostic/openapiv2/OpenAPIv2.proto → .../gnostic-models/openapiv2/OpenAPIv2.proto
diff --git a/...ub.com/google/gnostic/openapiv2/README.md → ...google/gnostic-models/openapiv2/README.md b/...ub.com/google/gnostic/openapiv2/README.md → ...google/gnostic-models/openapiv2/README.md
diff --git a/....com/google/gnostic/openapiv2/document.go → ...ogle/gnostic-models/openapiv2/document.go b/....com/google/gnostic/openapiv2/document.go → ...ogle/gnostic-models/openapiv2/document.go
diff --git a/...google/gnostic/openapiv2/openapi-2.0.json → ...gnostic-models/openapiv2/openapi-2.0.json b/...google/gnostic/openapiv2/openapi-2.0.json → ...gnostic-models/openapiv2/openapi-2.0.json
diff --git a/...com/google/gnostic/openapiv3/OpenAPIv3.go → ...gle/gnostic-models/openapiv3/OpenAPIv3.go b/...com/google/gnostic/openapiv3/OpenAPIv3.go → ...gle/gnostic-models/openapiv3/OpenAPIv3.go
diff --git a/.../google/gnostic/openapiv3/OpenAPIv3.pb.go → .../gnostic-models/openapiv3/OpenAPIv3.pb.go b/.../google/gnostic/openapiv3/OpenAPIv3.pb.go → .../gnostic-models/openapiv3/OpenAPIv3.pb.go
diff --git a/.../google/gnostic/openapiv3/OpenAPIv3.proto → .../gnostic-models/openapiv3/OpenAPIv3.proto b/.../google/gnostic/openapiv3/OpenAPIv3.proto → .../gnostic-models/openapiv3/OpenAPIv3.proto
diff --git a/...ub.com/google/gnostic/openapiv3/README.md → ...google/gnostic-models/openapiv3/README.md b/...ub.com/google/gnostic/openapiv3/README.md → ...google/gnostic-models/openapiv3/README.md
diff --git a/....com/google/gnostic/openapiv3/document.go → ...ogle/gnostic-models/openapiv3/document.go b/....com/google/gnostic/openapiv3/document.go → ...ogle/gnostic-models/openapiv3/document.go