Revert "Merge pull request kubernetes#118204 from sttts/sttts-openapi-v2-parameter-refs"

This reverts commit f42ff86, reversing
changes made to b4d793c.

Author: sushanth0910

api/openapi-spec/swagger.json

@@ -115,7 +115,7 @@ require (
 	k8s.io/kms v0.0.0
 	k8s.io/kube-aggregator v0.0.0
 	k8s.io/kube-controller-manager v0.0.0
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
+	k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961
 	k8s.io/kube-proxy v0.0.0
 	k8s.io/kube-scheduler v0.0.0
 	k8s.io/kubectl v0.0.0

go.mod

@@ -1425,8 +1425,8 @@ k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
 k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
-k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
+k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961 h1:pqRVJGQJz6oeZby8qmPKXYIBjyrcv7EHCe/33UkZMYA=
+k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961/go.mod h1:l8HTwL5fqnlns4jOveW1L75eo7R9KFHxiE0bsPGy428=
 k8s.io/system-validators v1.8.0 h1:tq05tdO9zdJZnNF3SXrq6LE7Knc/KfJm5wk68467JDg=
 k8s.io/system-validators v1.8.0/go.mod h1:gP1Ky+R9wtrSiFbrpEPwWMeYz9yqyy1S/KOh0Vci7WI=
 k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=

go.sum

@@ -31,7 +31,7 @@ require (
 	k8s.io/code-generator v0.0.0
 	k8s.io/component-base v0.0.0
 	k8s.io/klog/v2 v2.100.1
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
+	k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3

staging/src/k8s.io/api/go.sum

@@ -520,7 +520,7 @@ func TestCRDRouteParameterBuilder(t *testing.T) {
 				hasNamespaceParam := false
 				hasNameParam := false
 				for _, param := range path.Parameters {
-					if strings.HasPrefix(param.Ref.String(), "#/parameters/namespace-") {
+					if param.In == "path" && param.Name == "namespace" {
 						hasNamespaceParam = true
 					}
 					if param.In == "path" && param.Name == "name" {

staging/src/k8s.io/apiextensions-apiserver/go.mod

@@ -35,20 +35,14 @@ func MergeSpecs(staticSpec *spec.Swagger, crdSpecs ...*spec.Swagger) (*spec.Swag
 	// create shallow copy of staticSpec, but replace paths and definitions because we modify them.
 	specToReturn := *staticSpec
 	if staticSpec.Definitions != nil {
-		specToReturn.Definitions = make(spec.Definitions, len(staticSpec.Definitions))
+		specToReturn.Definitions = spec.Definitions{}
 		for k, s := range staticSpec.Definitions {
 			specToReturn.Definitions[k] = s
 		}
 	}
-	if staticSpec.Parameters != nil {
-		specToReturn.Parameters = make(map[string]spec.Parameter, len(staticSpec.Parameters))
-		for k, s := range staticSpec.Parameters {
-			specToReturn.Parameters[k] = s
-		}
-	}
 	if staticSpec.Paths != nil {
 		specToReturn.Paths = &spec.Paths{
-			Paths: make(map[string]spec.PathItem, len(staticSpec.Paths.Paths)),
+			Paths: map[string]spec.PathItem{},
 		}
 		for k, p := range staticSpec.Paths.Paths {
 			specToReturn.Paths.Paths[k] = p
@@ -64,13 +58,13 @@ func MergeSpecs(staticSpec *spec.Swagger, crdSpecs ...*spec.Swagger) (*spec.Swag
 
 	// The static spec has the highest priority. Resolve conflicts to prevent user-defined
 	// CRDs potentially overlapping the built-in apiextensions API
-	if err := aggregator.MergeSpecsIgnorePathConflictRenamingDefinitionsAndParameters(&specToReturn, crdSpec); err != nil {
+	if err := aggregator.MergeSpecsIgnorePathConflict(&specToReturn, crdSpec); err != nil {
 		return nil, err
 	}
 	return &specToReturn, nil
 }
 
-// mergeSpec copies paths, parameters and definitions from source to dest, mutating dest, but not source.
+// mergeSpec copies paths and definitions from source to dest, mutating dest, but not source.
 // We assume that conflicts do not matter.
 func mergeSpec(dest, source *spec.Swagger) {
 	if source == nil || source.Paths == nil {
@@ -81,19 +75,13 @@ func mergeSpec(dest, source *spec.Swagger) {
 	}
 	for k, v := range source.Definitions {
 		if dest.Definitions == nil {
-			dest.Definitions = make(spec.Definitions, len(source.Definitions))
+			dest.Definitions = spec.Definitions{}
 		}
 		dest.Definitions[k] = v
 	}
-	for k, v := range source.Parameters {
-		if dest.Parameters == nil {
-			dest.Parameters = make(map[string]spec.Parameter, len(source.Parameters))
-		}
-		dest.Parameters[k] = v
-	}
 	for k, v := range source.Paths.Paths {
 		if dest.Paths.Paths == nil {
-			dest.Paths.Paths = make(map[string]spec.PathItem, len(source.Paths.Paths))
+			dest.Paths.Paths = map[string]spec.PathItem{}
 		}
 		dest.Paths.Paths[k] = v
 	}

staging/src/k8s.io/apiextensions-apiserver/go.sum

@@ -23,7 +23,7 @@ require (
 	golang.org/x/time v0.3.0
 	gopkg.in/inf.v0 v0.9.1
 	k8s.io/klog/v2 v2.100.1
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
+	k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder_test.go

@@ -47,7 +47,7 @@ require (
 	k8s.io/component-base v0.0.0
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/kms v0.0.0
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
+	k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd