From 6bb6c9934294d8265197c9dfc4c9dd3adaca147a Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 24 Mar 2025 09:37:26 -0400 Subject: [PATCH] Drop null creationTimestamp from test fixtures --- api/discovery/aggregated_v2.json | 22 ------------ .../app/phases/addons/proxy/proxy_test.go | 4 --- cmd/kubeadm/app/phases/etcd/local_test.go | 1 - cmd/kubeadm/app/util/staticpod/utils_test.go | 4 +-- .../replication_controller_example.json | 1 - pkg/client/tests/clientset_test.go | 8 ++--- pkg/controller/deployment/util/hash_test.go | 1 - .../testdata/cluster-role-bindings.yaml | 12 ------- .../testdata/cluster-roles-featuregates.yaml | 32 ----------------- .../testdata/cluster-roles.yaml | 31 ---------------- .../testdata/controller-role-bindings.yaml | 35 ------------------- .../testdata/controller-roles.yaml | 35 ------------------- .../testdata/namespace-role-bindings.yaml | 7 ---- .../testdata/namespace-roles.yaml | 7 ---- .../apiserver/customresource_handler_test.go | 2 -- .../crds/standard-install.yaml | 4 --- .../unstructured_conversion_test.go | 32 ++++++----------- .../serializer/json/collections_test.go | 23 ++++++------ .../pkg/test/api_meta_meta_test.go | 2 +- .../apiserver/pkg/endpoints/apiserver_test.go | 24 ++++++------- .../client-go/applyconfigurations/doc.go | 1 - .../client-go/dynamic/fake/simple_test.go | 3 +- .../TestGoldenResponse/responses/events | 4 +-- .../dynamic/testdata/TestGoldenResponse/watch | 2 +- .../kube-scheduler/extender/v1/types_test.go | 6 ++-- .../kubectl/pkg/cmd/apply/apply_test.go | 6 ---- .../kubectl/pkg/cmd/auth/whoami_test.go | 12 ++----- .../pkg/cmd/create/create_token_test.go | 3 +- .../testcase-edit-output-patch/0.response | 2 +- .../testcase-edit-output-patch/1.edited | 2 +- .../testcase-edit-output-patch/1.original | 2 +- .../0.response | 1 - .../testcase-edit-subresource-status/1.edited | 1 - .../1.original | 1 - .../2.response | 1 - .../testcase-not-update-annotation/0.response | 2 +- .../testcase-not-update-annotation/1.edited | 2 +- .../testcase-not-update-annotation/1.original | 2 +- .../testcase-update-annotation/0.response | 2 +- .../testcase-update-annotation/1.edited | 2 +- .../testcase-update-annotation/1.original | 2 +- .../kubectl/pkg/cmd/expose/expose_test.go | 4 --- .../k8s.io/kubectl/pkg/cmd/get/get_test.go | 15 +++----- .../pkg/cmd/rollout/rollout_history_test.go | 19 +++------- .../k8s.io/kubectl/pkg/cmd/run/run_test.go | 4 --- .../pkg/polymorphichelpers/rollback_test.go | 2 +- .../testdata/apply/deploy-serverside.yaml | 3 +- .../apply/rc-managedfields-lastapplied.yaml | 1 - .../test/fixtures_test.go | 1 - test/e2e/framework/pod/wait_test.go | 6 ---- ...lator.storage.k8s.io_volumepopulators.yaml | 1 - .../kubectl/cmd/apply/deploy-serverside.yaml | 3 +- test/integration/auth/auth_test.go | 3 +- test/integration/etcd/data.go | 18 +++++----- test/utils/format/format_test.go | 9 ++--- 55 files changed, 85 insertions(+), 350 deletions(-) diff --git a/api/discovery/aggregated_v2.json b/api/discovery/aggregated_v2.json index 607549e1b15..9618c8eb7b9 100644 --- a/api/discovery/aggregated_v2.json +++ b/api/discovery/aggregated_v2.json @@ -3,7 +3,6 @@ "items": [ { "metadata": { - "creationTimestamp": null, "name": "apiregistration.k8s.io" }, "versions": [ @@ -55,7 +54,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "apps" }, "versions": [ @@ -292,7 +290,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "events.k8s.io" }, "versions": [ @@ -329,7 +326,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "authentication.k8s.io" }, "versions": [ @@ -369,7 +365,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "authorization.k8s.io" }, "versions": [ @@ -435,7 +430,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "autoscaling" }, "versions": [ @@ -537,7 +531,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "batch" }, "versions": [ @@ -630,7 +623,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "certificates.k8s.io" }, "versions": [ @@ -747,7 +739,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "networking.k8s.io" }, "versions": [ @@ -964,7 +955,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "policy" }, "versions": [ @@ -1016,7 +1006,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "rbac.authorization.k8s.io" }, "versions": [ @@ -1110,7 +1099,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "storage.k8s.io" }, "versions": [ @@ -1300,7 +1288,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "admissionregistration.k8s.io" }, "versions": [ @@ -1540,7 +1527,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "apiextensions.k8s.io" }, "versions": [ @@ -1596,7 +1582,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "scheduling.k8s.io" }, "versions": [ @@ -1633,7 +1618,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "coordination.k8s.io" }, "versions": [ @@ -1719,7 +1703,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "node.k8s.io" }, "versions": [ @@ -1753,7 +1736,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "discovery.k8s.io" }, "versions": [ @@ -1787,7 +1769,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "resource.k8s.io" }, "versions": [ @@ -2118,7 +2099,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "flowcontrol.apiserver.k8s.io" }, "versions": [ @@ -2202,7 +2182,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "internal.apiserver.k8s.io" }, "versions": [ @@ -2251,7 +2230,6 @@ }, { "metadata": { - "creationTimestamp": null, "name": "storagemigration.k8s.io" }, "versions": [ diff --git a/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go b/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go index 518e36e858f..2f7b722d1d2 100644 --- a/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go +++ b/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go @@ -228,14 +228,12 @@ func TestPrintOrCreateKubeProxyObjects(t *testing.T) { apiVersion: v1 kind: ServiceAccount metadata: - creationTimestamp: null name: kube-proxy namespace: kube-system --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - creationTimestamp: null name: kubeadm:node-proxier roleRef: apiGroup: rbac.authorization.k8s.io @@ -249,7 +247,6 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - creationTimestamp: null name: kube-proxy namespace: kube-system rules: @@ -265,7 +262,6 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - creationTimestamp: null name: kube-proxy namespace: kube-system roleRef: diff --git a/cmd/kubeadm/app/phases/etcd/local_test.go b/cmd/kubeadm/app/phases/etcd/local_test.go index f2148c77135..0417ccb3880 100644 --- a/cmd/kubeadm/app/phases/etcd/local_test.go +++ b/cmd/kubeadm/app/phases/etcd/local_test.go @@ -93,7 +93,6 @@ kind: Pod metadata: annotations: kubeadm.kubernetes.io/etcd.advertise-client-urls: https://:2379 - creationTimestamp: null labels: component: etcd tier: control-plane diff --git a/cmd/kubeadm/app/util/staticpod/utils_test.go b/cmd/kubeadm/app/util/staticpod/utils_test.go index 7a5c2c444c6..65809fcd55f 100644 --- a/cmd/kubeadm/app/util/staticpod/utils_test.go +++ b/cmd/kubeadm/app/util/staticpod/utils_test.go @@ -812,7 +812,7 @@ func TestManifestFilesAreEqual(t *testing.T) { podYamls: []string{validPod, validPod2}, expectedResult: false, expectErr: false, - expectedDiff: `@@ -12 +12 @@ + expectedDiff: `@@ -11 +11 @@ - - image: gcr.io/google_containers/etcd-amd64:3.1.11 + - image: gcr.io/google_containers/etcd-amd64:3.1.12 `, @@ -822,7 +822,7 @@ func TestManifestFilesAreEqual(t *testing.T) { podYamls: []string{validPod, invalidWithDefaultFields}, expectedResult: false, expectErr: false, - expectedDiff: `@@ -14,0 +15 @@ + expectedDiff: `@@ -13,0 +14 @@ + restartPolicy: Always `, }, diff --git a/pkg/api/testing/replication_controller_example.json b/pkg/api/testing/replication_controller_example.json index 52e15c2e200..d23ced748d2 100644 --- a/pkg/api/testing/replication_controller_example.json +++ b/pkg/api/testing/replication_controller_example.json @@ -19,7 +19,6 @@ }, "template": { "metadata": { - "creationTimestamp": null, "labels": { "kubernetes.io/cluster-service": "true", "name": "elasticsearch-logging" diff --git a/pkg/client/tests/clientset_test.go b/pkg/client/tests/clientset_test.go index 3cb1f9740c9..dddbae82471 100644 --- a/pkg/client/tests/clientset_test.go +++ b/pkg/client/tests/clientset_test.go @@ -99,7 +99,7 @@ func TestClientContentType(t *testing.T) { contentType: "application/json", expectedPath: "/api/v1/namespaces/panda/pods", expectContentType: "application/json", - expectBody: `{"kind":"Pod","apiVersion":"v1","metadata":{"name":"snorlax","creationTimestamp":null},"spec":{"containers":null},"status":{}} + expectBody: `{"kind":"Pod","apiVersion":"v1","metadata":{"name":"snorlax"},"spec":{"containers":null},"status":{}} `, }, { @@ -116,7 +116,7 @@ func TestClientContentType(t *testing.T) { contentType: "application/json", expectedPath: "/apis/apps/v1/namespaces/panda/deployments/snorlax/scale", expectContentType: "application/json", - expectBody: `{"kind":"Scale","apiVersion":"autoscaling/v1","metadata":{"name":"snorlax","creationTimestamp":null},"spec":{},"status":{"replicas":0}} + expectBody: `{"kind":"Scale","apiVersion":"autoscaling/v1","metadata":{"name":"snorlax"},"spec":{},"status":{"replicas":0}} `, }, { @@ -125,7 +125,7 @@ func TestClientContentType(t *testing.T) { contentType: "", expectedPath: "/api/v1/namespaces/panda/examples", expectContentType: "application/json", - expectBody: `{"metadata":{"name":"snorlax","creationTimestamp":null},"spec":{"foo":"","bar":false},"status":{}} + expectBody: `{"metadata":{"name":"snorlax"},"spec":{"foo":"","bar":false},"status":{}} `, }, { @@ -134,7 +134,7 @@ func TestClientContentType(t *testing.T) { contentType: "application/json", expectedPath: "/api/v1/namespaces/panda/examples", expectContentType: "application/json", - expectBody: `{"metadata":{"name":"snorlax","creationTimestamp":null},"spec":{"foo":"","bar":false},"status":{}} + expectBody: `{"metadata":{"name":"snorlax"},"spec":{"foo":"","bar":false},"status":{}} `, }, } diff --git a/pkg/controller/deployment/util/hash_test.go b/pkg/controller/deployment/util/hash_test.go index 1134ca7caac..f3d2c4b0311 100644 --- a/pkg/controller/deployment/util/hash_test.go +++ b/pkg/controller/deployment/util/hash_test.go @@ -31,7 +31,6 @@ import ( var podSpec = ` { "metadata": { - "creationTimestamp": null, "labels": { "app": "cats" } diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-role-bindings.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-role-bindings.yaml index 6edfde1ba4f..7ca6edad56b 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-role-bindings.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-role-bindings.yaml @@ -5,7 +5,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: cluster-admin @@ -22,7 +21,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:basic-user @@ -39,7 +37,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:discovery @@ -56,7 +53,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kube-controller-manager @@ -73,7 +69,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kube-dns @@ -90,7 +85,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kube-scheduler @@ -107,7 +101,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:monitoring @@ -124,7 +117,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:node @@ -137,7 +129,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:node-proxier @@ -154,7 +145,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:public-info-viewer @@ -174,7 +164,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:service-account-issuer-discovery @@ -191,7 +180,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:volume-scheduler diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles-featuregates.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles-featuregates.yaml index 894f8c98cd1..ab02ccd3f6e 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles-featuregates.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles-featuregates.yaml @@ -9,7 +9,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: admin @@ -19,7 +18,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: cluster-admin @@ -43,7 +41,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults rbac.authorization.k8s.io/aggregate-to-admin: "true" @@ -54,7 +51,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults rbac.authorization.k8s.io/aggregate-to-admin: "true" @@ -85,7 +81,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults rbac.authorization.k8s.io/aggregate-to-edit: "true" @@ -260,7 +255,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults rbac.authorization.k8s.io/aggregate-to-view: "true" @@ -407,7 +401,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:auth-delegator @@ -429,7 +422,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:basic-user @@ -452,7 +444,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:certificatesigningrequests:nodeclient @@ -468,7 +459,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:certificatesigningrequests:selfnodeclient @@ -484,7 +474,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:kube-apiserver-client-approver @@ -502,7 +491,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:kube-apiserver-client-kubelet-approver @@ -520,7 +508,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:kubelet-serving-approver @@ -538,7 +525,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:legacy-unknown-approver @@ -556,7 +542,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:cluster-trust-bundle-discovery @@ -574,7 +559,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:discovery @@ -598,7 +582,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:heapster @@ -627,7 +610,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kube-aggregator @@ -646,7 +628,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kube-controller-manager @@ -734,7 +715,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kube-dns @@ -752,7 +732,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kube-scheduler @@ -981,7 +960,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kubelet-api-admin @@ -1022,7 +1000,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:monitoring @@ -1051,7 +1028,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:node @@ -1254,7 +1230,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:node-bootstrapper @@ -1273,7 +1248,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:node-problem-detector @@ -1304,7 +1278,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:node-proxier @@ -1353,7 +1326,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:persistent-volume-provisioner @@ -1405,7 +1377,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:public-info-viewer @@ -1423,7 +1394,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:service-account-issuer-discovery @@ -1440,7 +1410,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:volume-scheduler @@ -1482,7 +1451,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults rbac.authorization.k8s.io/aggregate-to-edit: "true" diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml index 8ced6871142..6446507d130 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml @@ -9,7 +9,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: admin @@ -19,7 +18,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: cluster-admin @@ -43,7 +41,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults rbac.authorization.k8s.io/aggregate-to-admin: "true" @@ -54,7 +51,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults rbac.authorization.k8s.io/aggregate-to-admin: "true" @@ -85,7 +81,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults rbac.authorization.k8s.io/aggregate-to-edit: "true" @@ -249,7 +244,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults rbac.authorization.k8s.io/aggregate-to-view: "true" @@ -386,7 +380,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:auth-delegator @@ -408,7 +401,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:basic-user @@ -431,7 +423,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:certificatesigningrequests:nodeclient @@ -447,7 +438,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:certificatesigningrequests:selfnodeclient @@ -463,7 +453,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:kube-apiserver-client-approver @@ -481,7 +470,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:kube-apiserver-client-kubelet-approver @@ -499,7 +487,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:kubelet-serving-approver @@ -517,7 +504,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:certificates.k8s.io:legacy-unknown-approver @@ -535,7 +521,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:discovery @@ -559,7 +544,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:heapster @@ -588,7 +572,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kube-aggregator @@ -607,7 +590,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kube-controller-manager @@ -695,7 +677,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kube-dns @@ -713,7 +694,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kube-scheduler @@ -888,7 +868,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:kubelet-api-admin @@ -929,7 +908,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:monitoring @@ -950,7 +928,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:node @@ -1127,7 +1104,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:node-bootstrapper @@ -1146,7 +1122,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:node-problem-detector @@ -1177,7 +1152,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:node-proxier @@ -1226,7 +1200,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:persistent-volume-provisioner @@ -1278,7 +1251,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:public-info-viewer @@ -1296,7 +1268,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:service-account-issuer-discovery @@ -1313,7 +1284,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:volume-scheduler @@ -1355,7 +1325,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults rbac.authorization.k8s.io/aggregate-to-edit: "true" diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-role-bindings.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-role-bindings.yaml index e5987b40a58..6cd4ac8e802 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-role-bindings.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-role-bindings.yaml @@ -5,7 +5,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:attachdetach-controller @@ -22,7 +21,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:certificate-controller @@ -39,7 +37,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:clusterrole-aggregation-controller @@ -56,7 +53,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:cronjob-controller @@ -73,7 +69,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:daemon-set-controller @@ -90,7 +85,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:deployment-controller @@ -107,7 +101,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:disruption-controller @@ -124,7 +117,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:endpoint-controller @@ -141,7 +133,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:endpointslice-controller @@ -158,7 +149,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:endpointslicemirroring-controller @@ -175,7 +165,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:ephemeral-volume-controller @@ -192,7 +181,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:expand-controller @@ -209,7 +197,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:generic-garbage-collector @@ -226,7 +213,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:horizontal-pod-autoscaler @@ -243,7 +229,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:job-controller @@ -260,7 +245,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:legacy-service-account-token-cleaner @@ -277,7 +261,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:namespace-controller @@ -294,7 +277,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:node-controller @@ -311,7 +293,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:persistent-volume-binder @@ -328,7 +309,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:pod-garbage-collector @@ -345,7 +325,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:pv-protection-controller @@ -362,7 +341,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:pvc-protection-controller @@ -379,7 +357,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:replicaset-controller @@ -396,7 +373,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:replication-controller @@ -413,7 +389,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:resourcequota-controller @@ -430,7 +405,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:root-ca-cert-publisher @@ -447,7 +421,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:route-controller @@ -464,7 +437,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:selinux-warning-controller @@ -481,7 +453,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:service-account-controller @@ -498,7 +469,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:service-cidrs-controller @@ -515,7 +485,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:service-controller @@ -532,7 +501,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:statefulset-controller @@ -549,7 +517,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:ttl-after-finished-controller @@ -566,7 +533,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:ttl-controller @@ -583,7 +549,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:validatingadmissionpolicy-status-controller diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml index e00024f4da6..dae9a25b183 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml @@ -5,7 +5,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:attachdetach-controller @@ -80,7 +79,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:certificate-controller @@ -140,7 +138,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:clusterrole-aggregation-controller @@ -161,7 +158,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:cronjob-controller @@ -221,7 +217,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:daemon-set-controller @@ -298,7 +293,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:deployment-controller @@ -363,7 +357,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:disruption-controller @@ -443,7 +436,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:endpoint-controller @@ -488,7 +480,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:endpointslice-controller @@ -534,7 +525,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:endpointslicemirroring-controller @@ -585,7 +575,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:ephemeral-volume-controller @@ -627,7 +616,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:expand-controller @@ -677,7 +665,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:generic-garbage-collector @@ -707,7 +694,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:horizontal-pod-autoscaler @@ -777,7 +763,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:job-controller @@ -828,7 +813,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:legacy-service-account-token-cleaner @@ -853,7 +837,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:namespace-controller @@ -889,7 +872,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:node-controller @@ -942,7 +924,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:persistent-volume-binder @@ -1030,7 +1011,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:pod-garbage-collector @@ -1062,7 +1042,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:pv-protection-controller @@ -1090,7 +1069,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:pvc-protection-controller @@ -1126,7 +1104,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:replicaset-controller @@ -1179,7 +1156,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:replication-controller @@ -1229,7 +1205,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:resourcequota-controller @@ -1261,7 +1236,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:root-ca-cert-publisher @@ -1287,7 +1261,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:route-controller @@ -1319,7 +1292,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:selinux-warning-controller @@ -1370,7 +1342,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:service-account-controller @@ -1395,7 +1366,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:service-cidrs-controller @@ -1446,7 +1416,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:service-controller @@ -1487,7 +1456,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:statefulset-controller @@ -1577,7 +1545,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:ttl-after-finished-controller @@ -1605,7 +1572,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:ttl-controller @@ -1633,7 +1599,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:validatingadmissionpolicy-status-controller diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/namespace-role-bindings.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/namespace-role-bindings.yaml index 8c956169955..08c1d883b8a 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/namespace-role-bindings.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/namespace-role-bindings.yaml @@ -5,7 +5,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:bootstrap-signer @@ -23,7 +22,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system::extension-apiserver-authentication-reader @@ -44,7 +42,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system::leader-locking-kube-controller-manager @@ -68,7 +65,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system::leader-locking-kube-scheduler @@ -89,7 +85,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:bootstrap-signer @@ -107,7 +102,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:cloud-provider @@ -125,7 +119,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:token-cleaner diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/namespace-roles.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/namespace-roles.yaml index eca3c6f73aa..3e45ae87fd2 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/namespace-roles.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/namespace-roles.yaml @@ -5,7 +5,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:bootstrap-signer @@ -41,7 +40,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: extension-apiserver-authentication-reader @@ -62,7 +60,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system::leader-locking-kube-controller-manager @@ -108,7 +105,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system::leader-locking-kube-scheduler @@ -154,7 +150,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:bootstrap-signer @@ -173,7 +168,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:cloud-provider @@ -193,7 +187,6 @@ items: metadata: annotations: rbac.authorization.kubernetes.io/autoupdate: "true" - creationTimestamp: null labels: kubernetes.io/bootstrapping: rbac-defaults name: system:controller:token-cleaner diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler_test.go index 3e77fe7197a..12b6f7c896a 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler_test.go @@ -678,7 +678,6 @@ unknown: foo` "apiVersion": "stable.example.com/v1beta1", "kind": "MultiVersion", "metadata": { - "creationTimestamp": null, "generation": 1, "name": "my-mv" }, @@ -695,7 +694,6 @@ unknown: foo` "apiVersion": "stable.example.com/v1beta1", "kind": "MultiVersion", "metadata": { - "creationTimestamp": null, "generation": 1, "name": "my-mv" }, diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/ratcheting_test_cases/crds/standard-install.yaml b/staging/src/k8s.io/apiextensions-apiserver/test/integration/ratcheting_test_cases/crds/standard-install.yaml index 86cabda08af..d5bd06c5f88 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/ratcheting_test_cases/crds/standard-install.yaml +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/ratcheting_test_cases/crds/standard-install.yaml @@ -26,7 +26,6 @@ metadata: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 gateway.networking.k8s.io/channel: standard - creationTimestamp: null name: gatewayclasses.gateway.networking.k8s.io spec: group: gateway.networking.k8s.io @@ -468,7 +467,6 @@ metadata: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 gateway.networking.k8s.io/channel: standard - creationTimestamp: null name: gateways.gateway.networking.k8s.io spec: group: gateway.networking.k8s.io @@ -2190,7 +2188,6 @@ metadata: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 gateway.networking.k8s.io/channel: standard - creationTimestamp: null name: httproutes.gateway.networking.k8s.io spec: group: gateway.networking.k8s.io @@ -6886,7 +6883,6 @@ metadata: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466 gateway.networking.k8s.io/bundle-version: v1.0.0-rc1 gateway.networking.k8s.io/channel: standard - creationTimestamp: null name: referencegrants.gateway.networking.k8s.io spec: group: gateway.networking.k8s.io diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_conversion_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_conversion_test.go index bed4a0f2f95..8b4d092ec74 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_conversion_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_conversion_test.go @@ -55,11 +55,9 @@ func TestObjectToUnstructuredConversion(t *testing.T) { Object: map[string]interface{}{ "apiVersion": "v1", "kind": "Carp", - "metadata": map[string]interface{}{ - "creationTimestamp": nil, - }, - "spec": map[string]interface{}{}, - "status": map[string]interface{}{}, + "metadata": map[string]interface{}{}, + "spec": map[string]interface{}{}, + "status": map[string]interface{}{}, }, }, }, @@ -78,8 +76,7 @@ func TestObjectToUnstructuredConversion(t *testing.T) { "apiVersion": "v1", "kind": "Carp", "metadata": map[string]interface{}{ - "creationTimestamp": nil, - "name": "noxu", + "name": "noxu", }, "spec": map[string]interface{}{ "hostname": "example.com", @@ -155,8 +152,7 @@ func TestUnstructuredToObjectConversion(t *testing.T) { "apiVersion": "v1", "kind": "Carp", "metadata": map[string]interface{}{ - "creationTimestamp": nil, - "name": "noxu", + "name": "noxu", }, "spec": map[string]interface{}{ "hostname": "example.com", @@ -181,8 +177,7 @@ func TestUnstructuredToObjectConversion(t *testing.T) { "apiVersion": "v1", "kind": "Carp", "metadata": map[string]interface{}{ - "creationTimestamp": nil, - "name": "noxu", + "name": "noxu", }, "spec": map[string]interface{}{ "hostname": "example.com", @@ -207,8 +202,7 @@ func TestUnstructuredToObjectConversion(t *testing.T) { "apiVersion": "v9", "kind": "Carp", "metadata": map[string]interface{}{ - "creationTimestamp": nil, - "name": "noxu", + "name": "noxu", }, "spec": map[string]interface{}{ "hostname": "example.com", @@ -232,8 +226,7 @@ func TestUnstructuredToObjectConversion(t *testing.T) { "apiVersion": "v1", "kind": "Carp", "metadata": map[string]interface{}{ - "creationTimestamp": nil, - "name": "noxu", + "name": "noxu", }, "spec": map[string]interface{}{ "hostname": "example.com", @@ -358,8 +351,7 @@ func TestUnstructuredToGVConversion(t *testing.T) { "apiVersion": "v1", "kind": "Carp", "metadata": map[string]interface{}{ - "creationTimestamp": nil, - "name": "noxu", + "name": "noxu", }, "spec": map[string]interface{}{ "hostname": "example.com", @@ -388,8 +380,7 @@ func TestUnstructuredToGVConversion(t *testing.T) { "apiVersion": "v1", "kind": "Carp", "metadata": map[string]interface{}{ - "creationTimestamp": nil, - "name": "noxu", + "name": "noxu", }, "spec": map[string]interface{}{ "hostname": "example.com", @@ -414,8 +405,7 @@ func TestUnstructuredToGVConversion(t *testing.T) { "apiVersion": "v1", "kind": "Carp", "metadata": map[string]interface{}{ - "creationTimestamp": nil, - "name": "noxu", + "name": "noxu", }, "spec": map[string]interface{}{ "hostname": "example.com", diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/collections_test.go b/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/collections_test.go index 57859e46dd6..0defd9e6b6d 100644 --- a/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/collections_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/collections_test.go @@ -23,11 +23,12 @@ import ( "github.com/google/go-cmp/cmp" + "sigs.k8s.io/randfill" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" testapigroupv1 "k8s.io/apimachinery/pkg/apis/testapigroup/v1" "k8s.io/apimachinery/pkg/runtime" - "sigs.k8s.io/randfill" ) func TestCollectionsEncoding(t *testing.T) { @@ -63,7 +64,7 @@ func testCollectionsEncoding(t *testing.T, s *Serializer, streamingEnabled bool) }, }, }, - expect: "{\"metadata\":{},\"items\":[{\"metadata\":{\"creationTimestamp\":null},\"Int\":1,\"Float32\":1,\"Float64\":1.1}]}\n", + expect: "{\"metadata\":{},\"items\":[{\"metadata\":{},\"Int\":1,\"Float32\":1,\"Float64\":1.1}]}\n", }, { name: "Unstructured object float", @@ -102,7 +103,7 @@ func testCollectionsEncoding(t *testing.T, s *Serializer, streamingEnabled bool) }, }, }, - expect: "{\"metadata\":{},\"items\":[{\"metadata\":{\"creationTimestamp\":null}}]}\n", + expect: "{\"metadata\":{},\"items\":[{\"metadata\":{}}]}\n", }, // Encoding Go strings containing invalid UTF-8 sequences without error { @@ -146,7 +147,7 @@ func testCollectionsEncoding(t *testing.T, s *Serializer, streamingEnabled bool) }, }, }, - expect: "{\"metadata\":{},\"items\":[{\"metadata\":{\"creationTimestamp\":null},\"spec\":{},\"status\":{}}]}\n", + expect: "{\"metadata\":{},\"items\":[{\"metadata\":{},\"spec\":{},\"status\":{}}]}\n", }, { name: "CarpList map nil", @@ -159,7 +160,7 @@ func testCollectionsEncoding(t *testing.T, s *Serializer, streamingEnabled bool) }, }, }, - expect: "{\"metadata\":{},\"items\":[{\"metadata\":{\"creationTimestamp\":null},\"spec\":{},\"status\":{}}]}\n", + expect: "{\"metadata\":{},\"items\":[{\"metadata\":{},\"spec\":{},\"status\":{}}]}\n", }, { name: "UnstructuredList items nil", @@ -237,7 +238,7 @@ func testCollectionsEncoding(t *testing.T, s *Serializer, streamingEnabled bool) }, }, }, - expect: "{\"metadata\":{},\"items\":[{\"metadata\":{\"creationTimestamp\":null},\"spec\":{},\"status\":{}}]}\n", + expect: "{\"metadata\":{},\"items\":[{\"metadata\":{},\"spec\":{},\"status\":{}}]}\n", }, { name: "CarpList map empty", @@ -250,7 +251,7 @@ func testCollectionsEncoding(t *testing.T, s *Serializer, streamingEnabled bool) }, }, }, - expect: "{\"metadata\":{},\"items\":[{\"metadata\":{\"creationTimestamp\":null},\"spec\":{},\"status\":{}}]}\n", + expect: "{\"metadata\":{},\"items\":[{\"metadata\":{},\"spec\":{},\"status\":{}}]}\n", }, { name: "UnstructuredList items empty", @@ -337,7 +338,7 @@ func testCollectionsEncoding(t *testing.T, s *Serializer, streamingEnabled bool) }, }, }, - expect: "{\"metadata\":{},\"items\":[{\"metadata\":{\"creationTimestamp\":null},\"Slice\":\"AQID\",\"Array\":[1,2,3]}]}\n", + expect: "{\"metadata\":{},\"items\":[{\"metadata\":{},\"Slice\":\"AQID\",\"Array\":[1,2,3]}]}\n", }, { name: "UnstructuredList object raw bytes", @@ -415,7 +416,7 @@ func testCollectionsEncoding(t *testing.T, s *Serializer, streamingEnabled bool) }}, }, }, - expect: "{\"kind\":\"List\",\"apiVersion\":\"v1\",\"metadata\":{\"resourceVersion\":\"2345\",\"continue\":\"abc\",\"remainingItemCount\":1},\"items\":[{\"kind\":\"Carp\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"pod\",\"namespace\":\"default\",\"creationTimestamp\":null},\"spec\":{},\"status\":{}}]}\n", + expect: "{\"kind\":\"List\",\"apiVersion\":\"v1\",\"metadata\":{\"resourceVersion\":\"2345\",\"continue\":\"abc\",\"remainingItemCount\":1},\"items\":[{\"kind\":\"Carp\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"pod\",\"namespace\":\"default\"},\"spec\":{},\"status\":{}}]}\n", }, { name: "List two elements", @@ -438,7 +439,7 @@ func testCollectionsEncoding(t *testing.T, s *Serializer, streamingEnabled bool) }}, }, }, - expect: `{"kind":"List","apiVersion":"v1","metadata":{"resourceVersion":"2345"},"items":[{"kind":"Carp","apiVersion":"v1","metadata":{"name":"pod","namespace":"default","creationTimestamp":null},"spec":{},"status":{}},{"kind":"Carp","apiVersion":"v1","metadata":{"name":"pod2","namespace":"default2","creationTimestamp":null},"spec":{},"status":{}}]} + expect: `{"kind":"List","apiVersion":"v1","metadata":{"resourceVersion":"2345"},"items":[{"kind":"Carp","apiVersion":"v1","metadata":{"name":"pod","namespace":"default"},"spec":{},"status":{}},{"kind":"Carp","apiVersion":"v1","metadata":{"name":"pod2","namespace":"default2"},"spec":{},"status":{}}]} `, }, { @@ -465,7 +466,7 @@ func testCollectionsEncoding(t *testing.T, s *Serializer, streamingEnabled bool) }, }, cannotStream: true, - expect: "{\"kind\":\"List\",\"apiVersion\":\"v1\",\"metadata\":{\"creationTimestamp\":null},\"spec\":{},\"status\":{}}\n", + expect: "{\"kind\":\"List\",\"apiVersion\":\"v1\",\"metadata\":{},\"spec\":{},\"status\":{}}\n", }, { name: "UnstructuredList empty", diff --git a/staging/src/k8s.io/apimachinery/pkg/test/api_meta_meta_test.go b/staging/src/k8s.io/apimachinery/pkg/test/api_meta_meta_test.go index 02c63f2041b..e7e57465307 100644 --- a/staging/src/k8s.io/apimachinery/pkg/test/api_meta_meta_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/test/api_meta_meta_test.go @@ -147,7 +147,7 @@ func TestGenericTypeMeta(t *testing.T) { Name string `json:"name,omitempty"` GenerateName string `json:"generateName,omitempty"` UID string `json:"uid,omitempty"` - CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` + CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty,omitzero"` SelfLink string `json:"selfLink,omitempty"` ResourceVersion string `json:"resourceVersion,omitempty"` APIVersion string `json:"apiVersion,omitempty"` diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go index 93cb60859c2..c1ee56614b8 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go @@ -4044,26 +4044,24 @@ func TestFieldValidation(t *testing.T) { var ( strictDecodingErr = `strict decoding error: duplicate field \"other\", unknown field \"unknown\"` strictDecodingWarns = []string{`duplicate field "other"`, `unknown field "unknown"`} - strictDecodingErrYAML = `strict decoding error: yaml: unmarshal errors:\n line 6: key \"other\" already set in map, unknown field \"unknown\"` - strictDecodingWarnsYAML = []string{`line 6: key "other" already set in map`, `unknown field "unknown"`} - strictDecodingErrYAMLPut = `strict decoding error: yaml: unmarshal errors:\n line 7: key \"other\" already set in map, unknown field \"unknown\"` - strictDecodingWarnsYAMLPut = []string{`line 7: key "other" already set in map`, `unknown field "unknown"`} + strictDecodingErrYAML = `strict decoding error: yaml: unmarshal errors:\n line 5: key \"other\" already set in map, unknown field \"unknown\"` + strictDecodingWarnsYAML = []string{`line 5: key "other" already set in map`, `unknown field "unknown"`} + strictDecodingErrYAMLPut = `strict decoding error: yaml: unmarshal errors:\n line 6: key \"other\" already set in map, unknown field \"unknown\"` + strictDecodingWarnsYAMLPut = []string{`line 6: key "other" already set in map`, `unknown field "unknown"`} - invalidJSONDataPost = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"creationTimestamp":null}, "other":"foo","other":"bar","unknown":"baz"}`) + invalidJSONDataPost = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{}, "other":"foo","other":"bar","unknown":"baz"}`) invalidYAMLDataPost = []byte(`apiVersion: test.group/version kind: Simple -metadata: - creationTimestamp: null +metadata: {} other: foo other: bar unknown: baz`) - invalidJSONDataPut = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"name":"id", "creationTimestamp":null}, "other":"foo","other":"bar","unknown":"baz"}`) + invalidJSONDataPut = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"name":"id"}, "other":"foo","other":"bar","unknown":"baz"}`) invalidYAMLDataPut = []byte(`apiVersion: test.group/version kind: Simple metadata: name: id - creationTimestamp: null other: foo other: bar unknown: baz`) @@ -4180,19 +4178,17 @@ unknown: baz`) // strict, warn, and ignore field validation handling. func BenchmarkFieldValidation(b *testing.B) { var ( - validJSONDataPost = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"creationTimestamp":null}, "other":"foo"}`) + validJSONDataPost = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{}, "other":"foo"}`) validYAMLDataPost = []byte(`apiVersion: test.group/version kind: Simple -metadata: - creationTimestamp: null +metadata: {} other: foo`) - validJSONDataPut = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"name":"id", "creationTimestamp":null}, "other":"bar"}`) + validJSONDataPut = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"name":"id"}, "other":"bar"}`) validYAMLDataPut = []byte(`apiVersion: test.group/version kind: Simple metadata: name: id - creationTimestamp: null other: bar`) validMergePatch = []byte(`{"labels":{"foo":"bar"}, "other": "bar"}`) diff --git a/staging/src/k8s.io/client-go/applyconfigurations/doc.go b/staging/src/k8s.io/client-go/applyconfigurations/doc.go index 8efc9523ed3..a28b4c0eece 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/doc.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/doc.go @@ -74,7 +74,6 @@ but when marshalled to YAML, produces: metadata: name: myHPA namespace: myNamespace - creationTimestamp: null spec: scaleTargetRef: kind: "" diff --git a/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go b/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go index 7e487616355..10dc3a2d576 100644 --- a/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go +++ b/staging/src/k8s.io/client-go/dynamic/fake/simple_test.go @@ -22,6 +22,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -421,8 +422,6 @@ func TestListWithTypedFixtures(t *testing.T) { u.SetGroupVersionKind(r.GetObjectKind().GroupVersionKind()) u.SetName(r.GetName()) u.SetNamespace(r.GetNamespace()) - // Needed see: https://github.com/kubernetes/kubernetes/issues/67610 - unstructured.SetNestedField(u.Object, nil, "metadata", "creationTimestamp") typedScheme := runtime.NewScheme() typedScheme.AddKnownTypeWithName(gvk, &mockResource{}) diff --git a/staging/src/k8s.io/client-go/dynamic/testdata/TestGoldenResponse/responses/events b/staging/src/k8s.io/client-go/dynamic/testdata/TestGoldenResponse/responses/events index 29078229f88..1f61d6ca584 100644 --- a/staging/src/k8s.io/client-go/dynamic/testdata/TestGoldenResponse/responses/events +++ b/staging/src/k8s.io/client-go/dynamic/testdata/TestGoldenResponse/responses/events @@ -10,8 +10,8 @@ Transfer-Encoding: chunked e9 {"type":"ADDED","object":{"kind":"ServiceAccount","apiVersion":"v1","metadata":{"name":"foobar","namespace":"default","uid":"a1453396-7a5c-405a-93f9-ff44af8e7689","resourceVersion":"217","creationTimestamp":"2024-09-18T14:06:40Z"}}} -ba -{"type":"BOOKMARK","object":{"kind":"ServiceAccount","apiVersion":"v1","metadata":{"resourceVersion":"964","creationTimestamp":null,"annotations":{"k8s.io/initial-events-end":"true"}}}} +a1 +{"type":"BOOKMARK","object":{"kind":"ServiceAccount","apiVersion":"v1","metadata":{"resourceVersion":"964","annotations":{"k8s.io/initial-events-end":"true"}}}} 0 diff --git a/staging/src/k8s.io/client-go/dynamic/testdata/TestGoldenResponse/watch b/staging/src/k8s.io/client-go/dynamic/testdata/TestGoldenResponse/watch index 66ce48c6379..af04f247555 100644 --- a/staging/src/k8s.io/client-go/dynamic/testdata/TestGoldenResponse/watch +++ b/staging/src/k8s.io/client-go/dynamic/testdata/TestGoldenResponse/watch @@ -1 +1 @@ -[{"object":{"apiVersion":"v1","kind":"ServiceAccount","metadata":{"creationTimestamp":"2024-09-18T14:06:40Z","name":"foobar","namespace":"default","resourceVersion":"217","uid":"a1453396-7a5c-405a-93f9-ff44af8e7689"}},"type":"ADDED"},{"object":{"apiVersion":"v1","kind":"ServiceAccount","metadata":{"annotations":{"k8s.io/initial-events-end":"true"},"creationTimestamp":null,"resourceVersion":"964"}},"type":"BOOKMARK"}] \ No newline at end of file +[{"object":{"apiVersion":"v1","kind":"ServiceAccount","metadata":{"creationTimestamp":"2024-09-18T14:06:40Z","name":"foobar","namespace":"default","resourceVersion":"217","uid":"a1453396-7a5c-405a-93f9-ff44af8e7689"}},"type":"ADDED"},{"object":{"apiVersion":"v1","kind":"ServiceAccount","metadata":{"annotations":{"k8s.io/initial-events-end":"true"},"resourceVersion":"964"}},"type":"BOOKMARK"}] diff --git a/staging/src/k8s.io/kube-scheduler/extender/v1/types_test.go b/staging/src/k8s.io/kube-scheduler/extender/v1/types_test.go index 9f7cc6ce924..51e3bf19131 100644 --- a/staging/src/k8s.io/kube-scheduler/extender/v1/types_test.go +++ b/staging/src/k8s.io/kube-scheduler/extender/v1/types_test.go @@ -52,7 +52,7 @@ func TestCompatibility(t *testing.T) { NodeNameToVictims: map[string]*Victims{"foo": {Pods: []*corev1.Pod{{ObjectMeta: metav1.ObjectMeta{Name: "podname"}}}, NumPDBViolations: 1}}, NodeNameToMetaVictims: map[string]*MetaVictims{"foo": {Pods: []*MetaPod{{UID: "myuid"}}, NumPDBViolations: 1}}, }, - expectJSON: `{"Pod":{"metadata":{"name":"podname","creationTimestamp":null},"spec":{"containers":null},"status":{}},"NodeNameToVictims":{"foo":{"Pods":[{"metadata":{"name":"podname","creationTimestamp":null},"spec":{"containers":null},"status":{}}],"NumPDBViolations":1}},"NodeNameToMetaVictims":{"foo":{"Pods":[{"UID":"myuid"}],"NumPDBViolations":1}}}`, + expectJSON: `{"Pod":{"metadata":{"name":"podname"},"spec":{"containers":null},"status":{}},"NodeNameToVictims":{"foo":{"Pods":[{"metadata":{"name":"podname"},"spec":{"containers":null},"status":{}}],"NumPDBViolations":1}},"NodeNameToMetaVictims":{"foo":{"Pods":[{"UID":"myuid"}],"NumPDBViolations":1}}}`, }, { emptyObj: &ExtenderArgs{}, @@ -61,7 +61,7 @@ func TestCompatibility(t *testing.T) { Nodes: &corev1.NodeList{Items: []corev1.Node{{ObjectMeta: metav1.ObjectMeta{Name: "nodename"}}}}, NodeNames: &[]string{"node1"}, }, - expectJSON: `{"Pod":{"metadata":{"name":"podname","creationTimestamp":null},"spec":{"containers":null},"status":{}},"Nodes":{"metadata":{},"items":[{"metadata":{"name":"nodename","creationTimestamp":null},"spec":{},"status":{"daemonEndpoints":{"kubeletEndpoint":{"Port":0}},"nodeInfo":{"machineID":"","systemUUID":"","bootID":"","kernelVersion":"","osImage":"","containerRuntimeVersion":"","kubeletVersion":"","kubeProxyVersion":"","operatingSystem":"","architecture":""}}}]},"NodeNames":["node1"]}`, + expectJSON: `{"Pod":{"metadata":{"name":"podname"},"spec":{"containers":null},"status":{}},"Nodes":{"metadata":{},"items":[{"metadata":{"name":"nodename"},"spec":{},"status":{"daemonEndpoints":{"kubeletEndpoint":{"Port":0}},"nodeInfo":{"machineID":"","systemUUID":"","bootID":"","kernelVersion":"","osImage":"","containerRuntimeVersion":"","kubeletVersion":"","kubeProxyVersion":"","operatingSystem":"","architecture":""}}}]},"NodeNames":["node1"]}`, }, { emptyObj: &ExtenderFilterResult{}, @@ -72,7 +72,7 @@ func TestCompatibility(t *testing.T) { FailedAndUnresolvableNodes: FailedNodesMap{"baz": "qux"}, Error: "myerror", }, - expectJSON: `{"Nodes":{"metadata":{},"items":[{"metadata":{"name":"nodename","creationTimestamp":null},"spec":{},"status":{"daemonEndpoints":{"kubeletEndpoint":{"Port":0}},"nodeInfo":{"machineID":"","systemUUID":"","bootID":"","kernelVersion":"","osImage":"","containerRuntimeVersion":"","kubeletVersion":"","kubeProxyVersion":"","operatingSystem":"","architecture":""}}}]},"NodeNames":["node1"],"FailedNodes":{"foo":"bar"},"FailedAndUnresolvableNodes":{"baz":"qux"},"Error":"myerror"}`, + expectJSON: `{"Nodes":{"metadata":{},"items":[{"metadata":{"name":"nodename"},"spec":{},"status":{"daemonEndpoints":{"kubeletEndpoint":{"Port":0}},"nodeInfo":{"machineID":"","systemUUID":"","bootID":"","kernelVersion":"","osImage":"","containerRuntimeVersion":"","kubeletVersion":"","kubeProxyVersion":"","operatingSystem":"","architecture":""}}}]},"NodeNames":["node1"],"FailedNodes":{"foo":"bar"},"FailedAndUnresolvableNodes":{"baz":"qux"},"Error":"myerror"}`, }, { emptyObj: &ExtenderBindingArgs{}, diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go index 8a48daa238f..66992cdda41 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go @@ -2605,7 +2605,6 @@ metadata: applyset.kubernetes.io/additional-namespaces: "" applyset.kubernetes.io/contains-group-kinds: ReplicationController applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$ - creationTimestamp: null labels: applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1 name: my-set @@ -2639,7 +2638,6 @@ metadata: applyset.kubernetes.io/additional-namespaces: "" applyset.kubernetes.io/contains-group-kinds: ReplicationController,Service applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$ - creationTimestamp: null labels: applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1 name: my-set @@ -2674,7 +2672,6 @@ metadata: applyset.kubernetes.io/additional-namespaces: "" applyset.kubernetes.io/contains-group-kinds: ReplicationController,Service applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$ - creationTimestamp: null labels: applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1 name: my-set @@ -2709,7 +2706,6 @@ metadata: applyset.kubernetes.io/additional-namespaces: "" applyset.kubernetes.io/contains-group-kinds: Service applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$ - creationTimestamp: null labels: applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1 name: my-set @@ -2872,7 +2868,6 @@ metadata: applyset.kubernetes.io/additional-namespaces: test applyset.kubernetes.io/contains-group-kinds: ReplicationController applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$ - creationTimestamp: null labels: applyset.kubernetes.io/id: applyset-rhp1a-HVAVT_dFgyEygyA1BEB82HPp2o10UiFTpqtAs-v1 name: my-set @@ -3090,7 +3085,6 @@ metadata: 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.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1 name: my-set diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/auth/whoami_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/auth/whoami_test.go index 895fd903a71..279686d2d32 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/auth/whoami_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/auth/whoami_test.go @@ -75,9 +75,7 @@ func TestWhoAmIRun(t *testing.T) { `{ "kind": "SelfSubjectReview", "apiVersion": "authentication.k8s.io/v1", - "metadata": { - "creationTimestamp": null - }, + "metadata": {}, "status": { "userInfo": { "username": "jane.doe", @@ -131,9 +129,7 @@ func TestWhoAmIRun(t *testing.T) { `{ "kind": "SelfSubjectReview", "apiVersion": "authentication.k8s.io/v1beta1", - "metadata": { - "creationTimestamp": null - }, + "metadata": {}, "status": { "userInfo": { "username": "jane.doe", @@ -186,9 +182,7 @@ func TestWhoAmIRun(t *testing.T) { `{ "kind": "SelfSubjectReview", "apiVersion": "authentication.k8s.io/v1", - "metadata": { - "creationTimestamp": null - }, + "metadata": {}, "status": { "userInfo": { "username": "jane.doe", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_token_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_token_test.go index fd928b9f0f7..ee58cb0bf36 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_token_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_token_test.go @@ -99,8 +99,7 @@ func TestCreateToken(t *testing.T) { serverResponseToken: "abc", expectStdout: `apiVersion: authentication.k8s.io/v1 kind: TokenRequest -metadata: - creationTimestamp: null +metadata: {} spec: audiences: null boundObjectRef: null diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.response index b4693de4941..5f543d6aae9 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.response +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.response @@ -3,7 +3,7 @@ "kind": "Service", "metadata": { "annotations": { - "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"creationTimestamp\":null,\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" + "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" }, "creationTimestamp": "2017-02-27T19:40:53Z", "labels": { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.edited index 51de60e112b..2ade8fa7b7b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.edited +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.edited @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.original index 38d71f24703..bcdea71bbf4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.original +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.original @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/0.response index 0eb0dad8eb9..eb89f133c49 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/0.response +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/0.response @@ -33,7 +33,6 @@ }, "template": { "metadata": { - "creationTimestamp": null, "labels": { "app": "nginx" } diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.edited index 5b00fe733a9..95e1ed8eb8e 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.edited +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.edited @@ -29,7 +29,6 @@ spec: type: RollingUpdate template: metadata: - creationTimestamp: null labels: app: nginx spec: diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.original index 8c6dff1c22d..25c047dcf74 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.original +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.original @@ -29,7 +29,6 @@ spec: type: RollingUpdate template: metadata: - creationTimestamp: null labels: app: nginx spec: diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/2.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/2.response index e6c018b2cfe..553754215ec 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/2.response +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-edit-subresource-status/2.response @@ -33,7 +33,6 @@ }, "template": { "metadata": { - "creationTimestamp": null, "labels": { "app": "nginx" } diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.response index b4693de4941..5f543d6aae9 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.response +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.response @@ -3,7 +3,7 @@ "kind": "Service", "metadata": { "annotations": { - "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"creationTimestamp\":null,\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" + "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" }, "creationTimestamp": "2017-02-27T19:40:53Z", "labels": { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.edited index 51de60e112b..2ade8fa7b7b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.edited +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.edited @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.original index 38d71f24703..bcdea71bbf4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.original +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.original @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/0.response b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/0.response index b4693de4941..5f543d6aae9 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/0.response +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/0.response @@ -3,7 +3,7 @@ "kind": "Service", "metadata": { "annotations": { - "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"creationTimestamp\":null,\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" + "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" }, "creationTimestamp": "2017-02-27T19:40:53Z", "labels": { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.edited b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.edited index 51de60e112b..2ade8fa7b7b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.edited +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.edited @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.original b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.original index 38d71f24703..bcdea71bbf4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.original +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/testcase-update-annotation/1.original @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go index e624d5c1466..a1d32d9a56c 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go @@ -694,7 +694,6 @@ func TestExposeOverride(t *testing.T) { expected: `apiVersion: v1 kind: Service metadata: - creationTimestamp: null labels: svc: test name: foo @@ -717,7 +716,6 @@ status: expected: `apiVersion: v1 kind: Service metadata: - creationTimestamp: null labels: svc: test name: foo @@ -745,7 +743,6 @@ status: expected: `apiVersion: v1 kind: Service metadata: - creationTimestamp: null labels: svc: test name: foo @@ -773,7 +770,6 @@ status: expected: `apiVersion: v1 kind: Service metadata: - creationTimestamp: null labels: svc: test name: foo diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go index 0776b6740be..95abf0197f7 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go @@ -1438,7 +1438,6 @@ func TestGetMultipleTypeObjectsAsList(t *testing.T) { "apiVersion": "v1", "kind": "Pod", "metadata": { - "creationTimestamp": null, "name": "foo", "namespace": "test", "resourceVersion": "10" @@ -1457,7 +1456,6 @@ func TestGetMultipleTypeObjectsAsList(t *testing.T) { "apiVersion": "v1", "kind": "Pod", "metadata": { - "creationTimestamp": null, "name": "bar", "namespace": "test", "resourceVersion": "11" @@ -1476,7 +1474,6 @@ func TestGetMultipleTypeObjectsAsList(t *testing.T) { "apiVersion": "v1", "kind": "Service", "metadata": { - "creationTimestamp": null, "name": "baz", "namespace": "test", "resourceVersion": "12" @@ -2367,10 +2364,10 @@ DELETED test pod/foo 0/0 0 }, { format: "json", - expected: `{"type":"ADDED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"creationTimestamp":null,"name":"bar","namespace":"test","resourceVersion":"9"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} -{"type":"ADDED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"creationTimestamp":null,"name":"foo","namespace":"test","resourceVersion":"10"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} -{"type":"MODIFIED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"creationTimestamp":null,"name":"foo","namespace":"test","resourceVersion":"11"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} -{"type":"DELETED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"creationTimestamp":null,"name":"foo","namespace":"test","resourceVersion":"12"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} + expected: `{"type":"ADDED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"name":"bar","namespace":"test","resourceVersion":"9"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} +{"type":"ADDED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"name":"foo","namespace":"test","resourceVersion":"10"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} +{"type":"MODIFIED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"name":"foo","namespace":"test","resourceVersion":"11"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} +{"type":"DELETED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"name":"foo","namespace":"test","resourceVersion":"12"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} `, }, { @@ -2379,7 +2376,6 @@ DELETED test pod/foo 0/0 0 apiVersion: v1 kind: Pod metadata: - creationTimestamp: null name: bar namespace: test resourceVersion: "9" @@ -2397,7 +2393,6 @@ object: apiVersion: v1 kind: Pod metadata: - creationTimestamp: null name: foo namespace: test resourceVersion: "10" @@ -2415,7 +2410,6 @@ object: apiVersion: v1 kind: Pod metadata: - creationTimestamp: null name: foo namespace: test resourceVersion: "11" @@ -2433,7 +2427,6 @@ object: apiVersion: v1 kind: Pod metadata: - creationTimestamp: null name: foo namespace: test resourceVersion: "12" diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_history_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_history_test.go index 1c8baff290f..c3390d1f640 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_history_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_history_test.go @@ -280,15 +280,12 @@ func TestRolloutHistoryWithOutput(t *testing.T) { "kind": "ReplicaSet", "apiVersion": "apps/v1", "metadata": { - "name": "rev2", - "creationTimestamp": null + "name": "rev2" }, "spec": { "selector": null, "template": { - "metadata": { - "creationTimestamp": null - }, + "metadata": {}, "spec": { "containers": null } @@ -305,13 +302,11 @@ func TestRolloutHistoryWithOutput(t *testing.T) { expectedOutput: `apiVersion: apps/v1 kind: ReplicaSet metadata: - creationTimestamp: null name: rev2 spec: selector: null template: - metadata: - creationTimestamp: null + metadata: {} spec: containers: null status: @@ -323,13 +318,11 @@ status: expectedOutput: `apiVersion: apps/v1 kind: ReplicaSet metadata: - creationTimestamp: null name: rev1 spec: selector: null template: - metadata: - creationTimestamp: null + metadata: {} spec: containers: null status: @@ -338,13 +331,11 @@ status: apiVersion: apps/v1 kind: ReplicaSet metadata: - creationTimestamp: null name: rev2 spec: selector: null template: - metadata: - creationTimestamp: null + metadata: {} spec: containers: null status: diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go index 86fe03463a7..8344fc477bd 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go @@ -655,7 +655,6 @@ func TestRunOverride(t *testing.T) { expectedOutput: `apiVersion: v1 kind: Pod metadata: - creationTimestamp: null labels: run: test name: test @@ -678,7 +677,6 @@ status: {} expectedOutput: `apiVersion: v1 kind: Pod metadata: - creationTimestamp: null labels: run: test name: test @@ -701,7 +699,6 @@ status: {} expectedOutput: `apiVersion: v1 kind: Pod metadata: - creationTimestamp: null labels: run: test name: test @@ -729,7 +726,6 @@ status: {} expectedOutput: `apiVersion: v1 kind: Pod metadata: - creationTimestamp: null labels: foo: bar run: test diff --git a/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollback_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollback_test.go index eaeb0513417..cd3fdb521c9 100644 --- a/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollback_test.go +++ b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollback_test.go @@ -62,7 +62,7 @@ func TestGetDeploymentPatch(t *testing.T) { t.Errorf("expected strategic merge patch, got %v", patchType) } expectedPatch := `[` + - `{"op":"replace","path":"/spec/template","value":{"metadata":{"creationTimestamp":null},"spec":{"containers":[{"name":"","image":"foo","resources":{}}]}}},` + + `{"op":"replace","path":"/spec/template","value":{"metadata":{},"spec":{"containers":[{"name":"","image":"foo","resources":{}}]}}},` + `{"op":"replace","path":"/metadata/annotations","value":{"a":"true"}}` + `]` if string(patchBytes) != expectedPatch { diff --git a/staging/src/k8s.io/kubectl/testdata/apply/deploy-serverside.yaml b/staging/src/k8s.io/kubectl/testdata/apply/deploy-serverside.yaml index 664b87fd770..fd211f582ff 100644 --- a/staging/src/k8s.io/kubectl/testdata/apply/deploy-serverside.yaml +++ b/staging/src/k8s.io/kubectl/testdata/apply/deploy-serverside.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: annotations: deployment.kubernetes.io/revision: "1" - kubectl.kubernetes.io/last-applied-configuration: '{"kind":"Deployment","apiVersion":"apps/v1","metadata":{"name":"nginx-deployment","creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"selector":{"matchLabels":{"name":"nginx"}},"template":{"metadata":{"creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"containers":[{"name":"nginx","image":"nginx","resources":{}}]}},"strategy":{}},"status":{}}' + kubectl.kubernetes.io/last-applied-configuration: '{"kind":"Deployment","apiVersion":"apps/v1","metadata":{"name":"nginx-deployment","labels":{"name":"nginx"}},"spec":{"selector":{"matchLabels":{"name":"nginx"}},"template":{"metadata":{"labels":{"name":"nginx"}},"spec":{"containers":[{"name":"nginx","image":"nginx","resources":{}}]}},"strategy":{}},"status":{}}' creationTimestamp: "2016-10-24T22:15:06Z" generation: 6 labels: @@ -25,7 +25,6 @@ spec: type: RollingUpdate template: metadata: - creationTimestamp: null labels: name: nginx spec: diff --git a/staging/src/k8s.io/kubectl/testdata/apply/rc-managedfields-lastapplied.yaml b/staging/src/k8s.io/kubectl/testdata/apply/rc-managedfields-lastapplied.yaml index a457e331b76..e9f79359b2c 100644 --- a/staging/src/k8s.io/kubectl/testdata/apply/rc-managedfields-lastapplied.yaml +++ b/staging/src/k8s.io/kubectl/testdata/apply/rc-managedfields-lastapplied.yaml @@ -77,7 +77,6 @@ spec: name: test-rc template: metadata: - creationTimestamp: null labels: name: test-rc spec: diff --git a/staging/src/k8s.io/pod-security-admission/test/fixtures_test.go b/staging/src/k8s.io/pod-security-admission/test/fixtures_test.go index bd386b61183..fdbfd5c0ee9 100644 --- a/staging/src/k8s.io/pod-security-admission/test/fixtures_test.go +++ b/staging/src/k8s.io/pod-security-admission/test/fixtures_test.go @@ -149,7 +149,6 @@ func testFixtureFile(t *testing.T, dir, name string, pod *corev1.Pod) string { } // clean up noise in fixtures - yamlData = []byte(strings.ReplaceAll(string(yamlData), " creationTimestamp: null\n", "")) yamlData = []byte(strings.ReplaceAll(string(yamlData), " resources: {}\n", "")) yamlData = []byte(strings.ReplaceAll(string(yamlData), "status: {}\n", "")) diff --git a/test/e2e/framework/pod/wait_test.go b/test/e2e/framework/pod/wait_test.go index 30ec0229f9f..739e93744af 100644 --- a/test/e2e/framework/pod/wait_test.go +++ b/test/e2e/framework/pod/wait_test.go @@ -327,7 +327,6 @@ Expected Pod to be in : "Running" Got instead: <*v1.Pod>: metadata: - creationTimestamp: null name: pending-pod namespace: default spec: @@ -350,7 +349,6 @@ Expected Pod to be in : "Running" Got instead: <*v1.Pod>: metadata: - creationTimestamp: null name: pending-pod namespace: default spec: @@ -369,7 +367,6 @@ In [It] at: wait_test.go:71