Skip to content

Commit

Permalink
Use standard *.kubernetes.io instead of *.k8s.io for ApplySet
Browse files Browse the repository at this point in the history 
Kubernetes-commit: a0cff30104ea950a5cc733a109e7f9084275e49e
  • Loading branch information
@KnVerey @k8s-publishing-bot
KnVerey authored and k8s-publishing-bot committed Mar 25, 2023
1 parent 0921f9b commit 83e5b6e
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 65 deletions.
22 changes: 11 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ require (
github.com/stretchr/testify v1.8.1
golang.org/x/sys v0.6.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20230315055835-286fd7ee0419
k8s.io/api v0.0.0-20230316181320-bad7d34a01c9
k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
k8s.io/cli-runtime v0.0.0-20230315090346-9185a9dd0ead
k8s.io/client-go v0.0.0-20230315061906-445660b561c3
k8s.io/component-base v0.0.0-20230315065615-6b9bb8ecc3d0
k8s.io/component-helpers v0.0.0-20230315070331-853a1039365a
k8s.io/client-go v0.0.0-20230317001143-1517ffb8d37c
k8s.io/component-base v0.0.0-20230325023505-4d24bb3c2a3c
k8s.io/component-helpers v0.0.0-20230325023700-0181d85c8099
k8s.io/klog/v2 v2.90.1
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a
k8s.io/metrics v0.0.0-20230315085338-9dbbb87d575a
k8s.io/metrics v0.0.0-20230325030455-478b9400612d
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
sigs.k8s.io/kustomize/kustomize/v5 v5.0.1
Expand Down Expand Up @@ -94,12 +94,12 @@ require (
)

replace (
k8s.io/api => k8s.io/api v0.0.0-20230315055835-286fd7ee0419
k8s.io/api => k8s.io/api v0.0.0-20230316181320-bad7d34a01c9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230315090346-9185a9dd0ead
k8s.io/client-go => k8s.io/client-go v0.0.0-20230315061906-445660b561c3
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230315053024-8fead9f64de8
k8s.io/component-base => k8s.io/component-base v0.0.0-20230315065615-6b9bb8ecc3d0
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230315070331-853a1039365a
k8s.io/metrics => k8s.io/metrics v0.0.0-20230315085338-9dbbb87d575a
k8s.io/client-go => k8s.io/client-go v0.0.0-20230317001143-1517ffb8d37c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230325021128-1e0c52da823a
k8s.io/component-base => k8s.io/component-base v0.0.0-20230325023505-4d24bb3c2a3c
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230325023700-0181d85c8099
k8s.io/metrics => k8s.io/metrics v0.0.0-20230325030455-478b9400612d
)
20 changes: 10 additions & 10 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,24 +539,24 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20230315055835-286fd7ee0419 h1:4aCwVAD4ugAc04mLcDwgZicreRARKKTaukyfvfeV7xM=
k8s.io/api v0.0.0-20230315055835-286fd7ee0419/go.mod h1:aZ6MBt4NMLXSxkSKFkoDaP4hTutnZIvH5dCSpOis9g4=
k8s.io/api v0.0.0-20230316181320-bad7d34a01c9 h1:RX71Fts5hM4MOPrwU2mAILmdHSQipOntTKs8SVRvZNA=
k8s.io/api v0.0.0-20230316181320-bad7d34a01c9/go.mod h1:aZ6MBt4NMLXSxkSKFkoDaP4hTutnZIvH5dCSpOis9g4=
k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 h1:n1qDRCTPAXwyXYg7eSpWDO9FdW79lwAQ9dAr1vETpn4=
k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
k8s.io/cli-runtime v0.0.0-20230315090346-9185a9dd0ead h1:HYtR8a33cxjM2XGQvAZaDXXjhY3nz9uWvbeYJSz6yl0=
k8s.io/cli-runtime v0.0.0-20230315090346-9185a9dd0ead/go.mod h1:wg6/UJ9wwfEEAXnyuuajHSr+YnMXL1K0yUrRHjXz3Do=
k8s.io/client-go v0.0.0-20230315061906-445660b561c3 h1:urBW+EemzKj3PArMtVVuRerDGvBiXcnS+OAoOjqQoaM=
k8s.io/client-go v0.0.0-20230315061906-445660b561c3/go.mod h1:D6IqTVZ0quZZGxz2yiqMrndPUjMSPJ6QNq5SiSz+Mv0=
k8s.io/component-base v0.0.0-20230315065615-6b9bb8ecc3d0 h1:IjneP02MOB07PIP9+PQjKrOIZEZ5T7umR+GIZkU4h0U=
k8s.io/component-base v0.0.0-20230315065615-6b9bb8ecc3d0/go.mod h1:kTuptveA6tUMLMKnaq4AbIAAk7IcdhwkbljAV3JZRpM=
k8s.io/component-helpers v0.0.0-20230315070331-853a1039365a h1:PIKao3YG7ZMiE+CtdM09YDcowRhGTdvCeEgWj3J9DKI=
k8s.io/component-helpers v0.0.0-20230315070331-853a1039365a/go.mod h1:A9EtjsBcZsrpz4EN9xqKQFxm9QfZrUPxTDLT1zVqYLw=
k8s.io/client-go v0.0.0-20230317001143-1517ffb8d37c h1:29TaJLdOV+6YadAIsdLLH5ImjgMWTuEm3a/COrgIGoI=
k8s.io/client-go v0.0.0-20230317001143-1517ffb8d37c/go.mod h1:+yf0C0ynOsv3GhBRexl/5CJzyS/uxZJ1Gtn6N5GuVmc=
k8s.io/component-base v0.0.0-20230325023505-4d24bb3c2a3c h1:Sqi30xPpSoyhAgVj6IxQiRGeC+VdzSDU2ZasbS0TV1A=
k8s.io/component-base v0.0.0-20230325023505-4d24bb3c2a3c/go.mod h1:kTuptveA6tUMLMKnaq4AbIAAk7IcdhwkbljAV3JZRpM=
k8s.io/component-helpers v0.0.0-20230325023700-0181d85c8099 h1:rqgqmwm+6Q2S1Ep+aVAjNDPnjW1ampC5sAQMyQpJbbE=
k8s.io/component-helpers v0.0.0-20230325023700-0181d85c8099/go.mod h1:11EdasJKy/EtVu5Pdsfpoo3YAU5mnS3Epub6Q457rTk=
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
k8s.io/metrics v0.0.0-20230315085338-9dbbb87d575a h1:wlnN/vvBP7A494EeyH8V4wI9wuLgSnyGl6L8xky8RoQ=
k8s.io/metrics v0.0.0-20230315085338-9dbbb87d575a/go.mod h1:1zyfqxFQAio8hMRmVrpgxJjPDeYiSKi+nlWFVNRO+mE=
k8s.io/metrics v0.0.0-20230325030455-478b9400612d h1:5e+YSiz4jgD8cnJtUz4QiNesiT4ed1BQBi6exVKQB1M=
k8s.io/metrics v0.0.0-20230325030455-478b9400612d/go.mod h1:5tATYsoj5do7EsBEmmllijQoyEC2itywECglk+pq0A0=
k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
60 changes: 30 additions & 30 deletions pkg/cmd/apply/apply_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2401,12 +2401,12 @@ func TestApplySetParentManagement(t *testing.T) {
kind: Secret
metadata:
annotations:
applyset.k8s.io/additional-namespaces: ""
applyset.k8s.io/contains-group-resources: replicationcontrollers
applyset.k8s.io/tooling: kubectl/v0.0.0-master+$Format:%H$
applyset.kubernetes.io/additional-namespaces: ""
applyset.kubernetes.io/contains-group-resources: replicationcontrollers
applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$
creationTimestamp: null
labels:
applyset.k8s.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1
applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1
name: my-set
namespace: test
uid: a-static-fake-uid
Expand Down Expand Up @@ -2435,12 +2435,12 @@ metadata:
kind: Secret
metadata:
annotations:
applyset.k8s.io/additional-namespaces: ""
applyset.k8s.io/contains-group-resources: replicationcontrollers,services
applyset.k8s.io/tooling: kubectl/v0.0.0-master+$Format:%H$
applyset.kubernetes.io/additional-namespaces: ""
applyset.kubernetes.io/contains-group-resources: replicationcontrollers,services
applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$
creationTimestamp: null
labels:
applyset.k8s.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1
applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1
name: my-set
namespace: test
uid: a-static-fake-uid
Expand Down Expand Up @@ -2470,12 +2470,12 @@ metadata:
kind: Secret
metadata:
annotations:
applyset.k8s.io/additional-namespaces: ""
applyset.k8s.io/contains-group-resources: replicationcontrollers,services
applyset.k8s.io/tooling: kubectl/v0.0.0-master+$Format:%H$
applyset.kubernetes.io/additional-namespaces: ""
applyset.kubernetes.io/contains-group-resources: replicationcontrollers,services
applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$
creationTimestamp: null
labels:
applyset.k8s.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1
applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1
name: my-set
namespace: test
uid: a-static-fake-uid
Expand Down Expand Up @@ -2505,12 +2505,12 @@ metadata:
kind: Secret
metadata:
annotations:
applyset.k8s.io/additional-namespaces: ""
applyset.k8s.io/contains-group-resources: services
applyset.k8s.io/tooling: kubectl/v0.0.0-master+$Format:%H$
applyset.kubernetes.io/additional-namespaces: ""
applyset.kubernetes.io/contains-group-resources: services
applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$
creationTimestamp: null
labels:
applyset.k8s.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1
applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1
name: my-set
namespace: test
uid: a-static-fake-uid
Expand All @@ -2537,19 +2537,19 @@ func TestApplySetInvalidLiveParent(t *testing.T) {
grsAnnotation: "",
toolingAnnotation: validToolingAnnotation,
idLabel: validIDLabel,
expectErr: "error: parsing ApplySet annotation on \"secrets./my-set\": kubectl requires the \"applyset.k8s.io/contains-group-resources\" annotation to be set on all ApplySet parent objects",
expectErr: "error: parsing ApplySet annotation on \"secrets./my-set\": kubectl requires the \"applyset.kubernetes.io/contains-group-resources\" annotation to be set on all ApplySet parent objects",
},
"group-resources annotation should not contain invalid resources": {
grsAnnotation: "does-not-exist",
toolingAnnotation: validToolingAnnotation,
idLabel: validIDLabel,
expectErr: "error: parsing ApplySet annotation on \"secrets./my-set\": invalid group resource in \"applyset.k8s.io/contains-group-resources\" annotation: no matches for /, Resource=does-not-exist",
expectErr: "error: parsing ApplySet annotation on \"secrets./my-set\": invalid group resource in \"applyset.kubernetes.io/contains-group-resources\" annotation: no matches for /, Resource=does-not-exist",
},
"tooling annotation is required": {
grsAnnotation: validGrsAnnotation,
toolingAnnotation: "",
idLabel: validIDLabel,
expectErr: "error: ApplySet parent object \"secrets./my-set\" already exists and is missing required annotation \"applyset.k8s.io/tooling\"",
expectErr: "error: ApplySet parent object \"secrets./my-set\" already exists and is missing required annotation \"applyset.kubernetes.io/tooling\"",
},
"tooling annotation must have kubectl prefix": {
grsAnnotation: validGrsAnnotation,
Expand All @@ -2573,13 +2573,13 @@ func TestApplySetInvalidLiveParent(t *testing.T) {
grsAnnotation: validGrsAnnotation,
toolingAnnotation: validToolingAnnotation,
idLabel: "",
expectErr: "error: ApplySet parent object \"secrets./my-set\" exists and does not have required label applyset.k8s.io/id",
expectErr: "error: ApplySet parent object \"secrets./my-set\" exists and does not have required label applyset.kubernetes.io/id",
},
"ID label must match the ApplySet's real ID": {
grsAnnotation: validGrsAnnotation,
toolingAnnotation: validToolingAnnotation,
idLabel: "somethingelse",
expectErr: fmt.Sprintf("error: ApplySet parent object \"secrets./my-set\" exists and has incorrect value for label \"applyset.k8s.io/id\" (got: somethingelse, want: %s)", validIDLabel),
expectErr: fmt.Sprintf("error: ApplySet parent object \"secrets./my-set\" exists and has incorrect value for label \"applyset.kubernetes.io/id\" (got: somethingelse, want: %s)", validIDLabel),
},
} {
t.Run(name, func(t *testing.T) {
Expand Down Expand Up @@ -2668,12 +2668,12 @@ func TestApplySet_ClusterScopedCustomResourceParent(t *testing.T) {
kind: ApplySet
metadata:
annotations:
applyset.k8s.io/additional-namespaces: test
applyset.k8s.io/contains-group-resources: replicationcontrollers
applyset.k8s.io/tooling: kubectl/v0.0.0-master+$Format:%H$
applyset.kubernetes.io/additional-namespaces: test
applyset.kubernetes.io/contains-group-resources: replicationcontrollers
applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$
creationTimestamp: null
labels:
applyset.k8s.io/id: applyset-rhp1a-HVAVT_dFgyEygyA1BEB82HPp2o10UiFTpqtAs-v1
applyset.kubernetes.io/id: applyset-rhp1a-HVAVT_dFgyEygyA1BEB82HPp2o10UiFTpqtAs-v1
name: my-set
`, string(updatedCRYaml))
}
Expand Down Expand Up @@ -2885,12 +2885,12 @@ func TestApplySetUpdateConflictsAreRetried(t *testing.T) {
kind: Secret
metadata:
annotations:
applyset.k8s.io/additional-namespaces: ""
applyset.k8s.io/contains-group-resources: replicationcontrollers
applyset.k8s.io/tooling: kubectl/v0.0.0-master+$Format:%H$
applyset.kubernetes.io/additional-namespaces: ""
applyset.kubernetes.io/contains-group-resources: replicationcontrollers
applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$
creationTimestamp: null
labels:
applyset.k8s.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1
applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1
name: my-set
namespace: test
`
Expand All @@ -2915,7 +2915,7 @@ metadata:
if req.URL.Path == pathSecret {
if !forceConflicts {
applyReturnedConflict = true
return &http.Response{StatusCode: http.StatusConflict, Header: cmdtesting.DefaultHeader(), Body: io.NopCloser(strings.NewReader("Apply failed with 1 conflict: conflict with \"other\": .metadata.annotations.applyset.k8s.io/contains-group-resources"))}, nil
return &http.Response{StatusCode: http.StatusConflict, Header: cmdtesting.DefaultHeader(), Body: io.NopCloser(strings.NewReader("Apply failed with 1 conflict: conflict with \"other\": .metadata.annotations.applyset.kubernetes.io/contains-group-resources"))}, nil
}
appliedWithConflictsForced = true
}
Expand Down
14 changes: 7 additions & 7 deletions pkg/cmd/apply/applyset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,25 @@ const (
// Tooling should refuse to mutate ApplySets belonging to other tools.
// The value must be in the format <toolname>/<semver>.
// Example value: "kubectl/v1.27" or "helm/v3" or "kpt/v1.0.0"
ApplySetToolingAnnotation = "applyset.k8s.io/tooling"
ApplySetToolingAnnotation = "applyset.kubernetes.io/tooling"

// ApplySetAdditionalNamespacesAnnotation annotation extends the scope of the ApplySet beyond the parent
// object's own namespace (if any) to include the listed namespaces. The value is a comma-separated
// list of the names of namespaces other than the parent's namespace in which objects are found
// Example value: "kube-system,ns1,ns2".
ApplySetAdditionalNamespacesAnnotation = "applyset.k8s.io/additional-namespaces"
ApplySetAdditionalNamespacesAnnotation = "applyset.kubernetes.io/additional-namespaces"

// ApplySetGRsAnnotation is a list of group-resources used to optimize listing of ApplySet member objects.
// It is optional in the ApplySet specification, as tools can perform discovery or use a different optimization.
// However, it is currently required in kubectl.
// When present, the value of this annotation must be a comma separated list of the group-kinds,
// in the fully-qualified name format, i.e. <resourcename>.<group>.
// Example value: "certificates.cert-manager.io,configmaps,deployments.apps,secrets,services"
ApplySetGRsAnnotation = "applyset.k8s.io/contains-group-resources"
ApplySetGRsAnnotation = "applyset.kubernetes.io/contains-group-resources"

// ApplySetParentIDLabel is the key of the label that makes object an ApplySet parent object.
// Its value MUST use the format specified in V1ApplySetIdFormat below
ApplySetParentIDLabel = "applyset.k8s.io/id"
ApplySetParentIDLabel = "applyset.kubernetes.io/id"

// V1ApplySetIdFormat is the format required for the value of ApplySetParentIDLabel (and ApplysetPartOfLabel).
// The %s segment is the unique ID of the object itself, which MUST be the base64 encoding
Expand All @@ -74,11 +74,11 @@ const (

// ApplysetPartOfLabel is the key of the label which indicates that the object is a member of an ApplySet.
// The value of the label MUST match the value of ApplySetParentIDLabel on the parent object.
ApplysetPartOfLabel = "applyset.k8s.io/part-of"
ApplysetPartOfLabel = "applyset.kubernetes.io/part-of"

// ApplysetParentCRDLabel is the key of the label that can be set on a CRD to identify
// the custom resource type it defines (not the CRD itself) as an allowed parent for an ApplySet.
ApplysetParentCRDLabel = "applyset.k8s.io/is-parent-type"
ApplysetParentCRDLabel = "applyset.kubernetes.io/is-parent-type"
)

var defaultApplySetParentGVR = schema.GroupVersionResource{Version: "v1", Resource: "secrets"}
Expand All @@ -88,7 +88,7 @@ type ApplySet struct {
// parentRef is a reference to the parent object that is used to track the applyset.
parentRef *ApplySetParentRef

// toolingID is the value to be used and validated in the applyset.k8s.io/tooling annotation.
// toolingID is the value to be used and validated in the applyset.kubernetes.io/tooling annotation.
toolingID ApplySetTooling

// currentResources is the set of resources that are part of the sever-side set as of when the current operation started.
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/apply/testdata/prune/simple/manifest1-expected-getobjects.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
applyset.k8s.io/part-of: applyset-bjd1LnyQq0mtUu-riZCqjDQOmh0iNb9O2RcuT12WR0k-v1
applyset.kubernetes.io/part-of: applyset-bjd1LnyQq0mtUu-riZCqjDQOmh0iNb9O2RcuT12WR0k-v1
name: foo

---
Expand All @@ -11,5 +11,5 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
applyset.k8s.io/part-of: applyset-bjd1LnyQq0mtUu-riZCqjDQOmh0iNb9O2RcuT12WR0k-v1
applyset.kubernetes.io/part-of: applyset-bjd1LnyQq0mtUu-riZCqjDQOmh0iNb9O2RcuT12WR0k-v1
name: bar
2 changes: 1 addition & 1 deletion pkg/cmd/apply/testdata/prune/simple/manifest2-expected-getobjects.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
applyset.k8s.io/part-of: applyset-bjd1LnyQq0mtUu-riZCqjDQOmh0iNb9O2RcuT12WR0k-v1
applyset.kubernetes.io/part-of: applyset-bjd1LnyQq0mtUu-riZCqjDQOmh0iNb9O2RcuT12WR0k-v1
name: foo
6 changes: 3 additions & 3 deletions testdata/apply/applyset-cr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ApplySet
metadata:
name: my-set
annotations:
applyset.k8s.io/tooling: kubectl/v0.0.0
applyset.k8s.io/contains-group-resources: ""
applyset.kubernetes.io/tooling: kubectl/v0.0.0
applyset.kubernetes.io/contains-group-resources: ""
labels:
applyset.k8s.io/id: applyset-rhp1a-HVAVT_dFgyEygyA1BEB82HPp2o10UiFTpqtAs-v1
applyset.kubernetes.io/id: applyset-rhp1a-HVAVT_dFgyEygyA1BEB82HPp2o10UiFTpqtAs-v1
2 changes: 1 addition & 1 deletion testdata/apply/applysets-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
name: applysets.company.com
labels:
applyset.k8s.io/is-parent-type: "true"
applyset.kubernetes.io/is-parent-type: "true"
spec:
group: company.com
names:
Expand Down

0 comments on commit 83e5b6e

Please sign in to comment.