github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove invalid merge key

Browse Source
This commit is contained in:
Joe Betz
2023-06-06 21:18:59 -04:00
parent 6f116dc4d5
commit 087fbc9304
18 changed files with 12 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/openapi-spec/swagger.json generated
View File

@@ -15774,9 +15774,7 @@
"properties": {
"key": {
"description": "key is the label key that the selector applies to.",
"type": "string",
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
"type": "string"
},
"operator": {
"description": "operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.",

4
api/openapi-spec/v3/api__v1_openapi.json
View File

@@ -8547,9 +8547,7 @@
"key": {
"default": "",
"description": "key is the label key that the selector applies to.",
"type": "string",
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
"type": "string"
},
"operator": {
"default": "",

4
api/openapi-spec/v3/apis__admissionregistration.k8s.io__v1_openapi.json
View File

@@ -978,9 +978,7 @@
"key": {
"default": "",
"description": "key is the label key that the selector applies to.",
"type": "string",
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
"type": "string"
},
"operator": {
"default": "",

4
api/openapi-spec/v3/apis__admissionregistration.k8s.io__v1alpha1_openapi.json
View File

@@ -1085,9 +1085,7 @@
"key": {
"default": "",
"description": "key is the label key that the selector applies to.",
"type": "string",
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
"type": "string"
},
"operator": {
"default": "",

4
api/openapi-spec/v3/apis__apps__v1_openapi.json
View File

@@ -5540,9 +5540,7 @@
"key": {
"default": "",
"description": "key is the label key that the selector applies to.",
"type": "string",
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
"type": "string"
},
"operator": {
"default": "",

4
api/openapi-spec/v3/apis__autoscaling__v2_openapi.json
View File

@@ -1330,9 +1330,7 @@
"key": {
"default": "",
"description": "key is the label key that the selector applies to.",
"type": "string",
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
"type": "string"
},
"operator": {
"default": "",

4
api/openapi-spec/v3/apis__batch__v1_openapi.json
View File

@@ -4714,9 +4714,7 @@
"key": {
"default": "",
"description": "key is the label key that the selector applies to.",
"type": "string",
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
"type": "string"
},
"operator": {
"default": "",

4
api/openapi-spec/v3/apis__networking.k8s.io__v1_openapi.json
View File

@@ -1275,9 +1275,7 @@
"key": {
"default": "",
"description": "key is the label key that the selector applies to.",
"type": "string",
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
"type": "string"
},
"operator": {
"default": "",

4
api/openapi-spec/v3/apis__policy__v1_openapi.json
View File

@@ -730,9 +730,7 @@
"key": {
"default": "",
"description": "key is the label key that the selector applies to.",
"type": "string",
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
"type": "string"
},
"operator": {
"default": "",

4
api/openapi-spec/v3/apis__rbac.authorization.k8s.io__v1_openapi.json
View File

@@ -987,9 +987,7 @@
"key": {
"default": "",
"description": "key is the label key that the selector applies to.",
"type": "string",
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
"type": "string"
},
"operator": {
"default": "",

4
api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json
View File

@@ -2419,9 +2419,7 @@
"key": {
"default": "",
"description": "key is the label key that the selector applies to.",
"type": "string",
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge"
"type": "string"
},
"operator": {
"default": "",

6
pkg/generated/openapi/zz_generated.openapi.go generated
View File

@@ -48756,12 +48756,6 @@ func schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref common.ReferenceCallba
Type: []string{"object"},
Properties: map[string]spec.Schema{
"key": {
VendorExtensible: spec.VendorExtensible{
Extensions: spec.Extensions{
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge",
},
},
SchemaProps: spec.SchemaProps{
Description: "key is the label key that the selector applies to.",
Default: "",

6
staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go generated
View File

@@ -4714,12 +4714,6 @@ func schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref common.ReferenceCallba
Type: []string{"object"},
Properties: map[string]spec.Schema{
"key": {
VendorExtensible: spec.VendorExtensible{
Extensions: spec.Extensions{
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge",
},
},
SchemaProps: spec.SchemaProps{
Description: "key is the label key that the selector applies to.",
Default: "",

2
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
View File

@@ -425,8 +425,6 @@ message LabelSelector {
// relates the key and values.
message LabelSelectorRequirement {
// key is the label key that the selector applies to.
// +patchMergeKey=key
// +patchStrategy=merge
optional string key = 1;
// operator represents a key's relationship to a set of values.

4
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go
View File

@@ -1207,9 +1207,7 @@ type LabelSelector struct {
// relates the key and values.
type LabelSelectorRequirement struct {
// key is the label key that the selector applies to.
// +patchMergeKey=key
// +patchStrategy=merge
Key string `json:"key" patchStrategy:"merge" patchMergeKey:"key" protobuf:"bytes,1,opt,name=key"`
Key string `json:"key" protobuf:"bytes,1,opt,name=key"`
// operator represents a key's relationship to a set of values.
// Valid operators are In, NotIn, Exists and DoesNotExist.
Operator LabelSelectorOperator `json:"operator" protobuf:"bytes,2,opt,name=operator,casttype=LabelSelectorOperator"`

6
staging/src/k8s.io/code-generator/examples/apiserver/openapi/zz_generated.openapi.go generated
View File

@@ -1011,12 +1011,6 @@ func schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref common.ReferenceCallba
Type: []string{"object"},
Properties: map[string]spec.Schema{
"key": {
VendorExtensible: spec.VendorExtensible{
Extensions: spec.Extensions{
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge",
},
},
SchemaProps: spec.SchemaProps{
Description: "key is the label key that the selector applies to.",
Default: "",

6
staging/src/k8s.io/kube-aggregator/pkg/generated/openapi/zz_generated.openapi.go generated
View File

@@ -1014,12 +1014,6 @@ func schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref common.ReferenceCallba
Type: []string{"object"},
Properties: map[string]spec.Schema{
"key": {
VendorExtensible: spec.VendorExtensible{
Extensions: spec.Extensions{
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge",
},
},
SchemaProps: spec.SchemaProps{
Description: "key is the label key that the selector applies to.",
Default: "",

6
staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go generated
View File

@@ -1012,12 +1012,6 @@ func schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref common.ReferenceCallba
Type: []string{"object"},
Properties: map[string]spec.Schema{
"key": {
VendorExtensible: spec.VendorExtensible{
Extensions: spec.Extensions{
"x-kubernetes-patch-merge-key": "key",
"x-kubernetes-patch-strategy": "merge",
},
},
SchemaProps: spec.SchemaProps{
Description: "key is the label key that the selector applies to.",
Default: "",