From bb822259984241fe5d84d59ef9ac31406dfd727e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20L=C3=A1zni=C4=8Dka?= Date: Wed, 9 Jul 2025 14:52:09 +0200 Subject: [PATCH] ImagePulledRecord API: don't serialize nulls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stanislav Láznička --- ...d8dc6a329b7e1c2e43951302b23a047cb20fd3e10090e4ce7e8396035405 | 2 +- staging/src/k8s.io/kubelet/config/v1alpha1/types.go | 2 +- staging/src/k8s.io/kubelet/config/v1beta1/types.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/images/pullmanager/testdata/pulled/sha256-dd1dd8dc6a329b7e1c2e43951302b23a047cb20fd3e10090e4ce7e8396035405 b/pkg/kubelet/images/pullmanager/testdata/pulled/sha256-dd1dd8dc6a329b7e1c2e43951302b23a047cb20fd3e10090e4ce7e8396035405 index e3e4af4cab3..877e8679b92 100644 --- a/pkg/kubelet/images/pullmanager/testdata/pulled/sha256-dd1dd8dc6a329b7e1c2e43951302b23a047cb20fd3e10090e4ce7e8396035405 +++ b/pkg/kubelet/images/pullmanager/testdata/pulled/sha256-dd1dd8dc6a329b7e1c2e43951302b23a047cb20fd3e10090e4ce7e8396035405 @@ -1 +1 @@ -{"kind":"ImagePulledRecord","apiVersion":"kubelet.config.k8s.io/v1alpha1","lastUpdatedTime":"2025-06-21T12:26:40Z","imageRef":"testimage-anonpull-alpha","credentialMapping":{"docker.io/testing/test":{"kubernetesSecrets":null,"nodePodsAccessible":true}}} +{"kind":"ImagePulledRecord","apiVersion":"kubelet.config.k8s.io/v1alpha1","lastUpdatedTime":"2025-06-21T12:26:40Z","imageRef":"testimage-anonpull-alpha","credentialMapping":{"docker.io/testing/test":{"nodePodsAccessible":true}}} diff --git a/staging/src/k8s.io/kubelet/config/v1alpha1/types.go b/staging/src/k8s.io/kubelet/config/v1alpha1/types.go index d999e116e5d..a965958472d 100644 --- a/staging/src/k8s.io/kubelet/config/v1alpha1/types.go +++ b/staging/src/k8s.io/kubelet/config/v1alpha1/types.go @@ -147,7 +147,7 @@ type ImagePullCredentials struct { // secrets that were used to pull the image. // +optional // +listType=set - KubernetesSecrets []ImagePullSecret `json:"kubernetesSecrets"` + KubernetesSecrets []ImagePullSecret `json:"kubernetesSecrets,omitempty"` // KubernetesServiceAccounts is an index of coordinates of all the kubernetes // service accounts that were used to pull the image. diff --git a/staging/src/k8s.io/kubelet/config/v1beta1/types.go b/staging/src/k8s.io/kubelet/config/v1beta1/types.go index 6acd0ceac33..a7c4e21829c 100644 --- a/staging/src/k8s.io/kubelet/config/v1beta1/types.go +++ b/staging/src/k8s.io/kubelet/config/v1beta1/types.go @@ -1186,7 +1186,7 @@ type ImagePullCredentials struct { // secrets that were used to pull the image. // +optional // +listType=set - KubernetesSecrets []ImagePullSecret `json:"kubernetesSecrets"` + KubernetesSecrets []ImagePullSecret `json:"kubernetesSecrets,omitempty"` // KubernetesServiceAccounts is an index of coordinates of all the kubernetes // service accounts that were used to pull the image.