Skip to content

Commit 8874bdf

Browse files
committed
Tag LabelSelector with +structType=atomic
1 parent f298d54 commit 8874bdf

File tree

8 files changed

+25
-2
lines changed

8 files changed

+25
-2
lines changed

api/openapi-spec/swagger.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,6 +1092,7 @@ type Patch struct{}
10921092
// A label selector is a label query over a set of resources. The result of matchLabels and
10931093
// matchExpressions are ANDed. An empty label selector matches all objects. A null
10941094
// label selector matches no objects.
1095+
// +structType=atomic
10951096
type LabelSelector struct {
10961097
// matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
10971098
// map is equivalent to an element of matchExpressions, whose key field is "key", the

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/lastappliedmanager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ spec:
349349
expectConflictSet: fieldpath.NewSet(
350350
fieldpath.MakePathOrDie("metadata", "labels", "app"),
351351
fieldpath.MakePathOrDie("spec", "replicas"),
352-
fieldpath.MakePathOrDie("spec", "selector", "matchLabels", "app"),
352+
fieldpath.MakePathOrDie("spec", "selector"), // selector is atomic
353353
fieldpath.MakePathOrDie("spec", "template", "metadata", "labels", "app"),
354354
fieldpath.MakePathOrDie("spec", "template", "spec", "containers", fieldpath.KeyByFields("name", "my-c"), "image"),
355355
),

staging/src/k8s.io/code-generator/_examples/apiserver/openapi/zz_generated.openapi.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)