github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 05:21:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93610 from liggitt/deterministic-container

Browse Source 
Make toKubeContainerImageSpec deterministic
This commit is contained in:
Kubernetes Prow Robot 2020-08-01 20:22:32 -07:00 committed by GitHub
commit 78ab6d8bdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubelet/kuberuntime/convert.go
View File

@ -17,6 +17,8 @@ limitations under the License.
package kuberuntime
import (
"sort"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
)
@ -26,11 +28,16 @@ import (
func toKubeContainerImageSpec(image *runtimeapi.Image) kubecontainer.ImageSpec {
var annotations []kubecontainer.Annotation
if image.Spec != nil && image.Spec.Annotations != nil {
for k, v := range image.Spec.Annotations {
if image.Spec != nil && len(image.Spec.Annotations) > 0 {
annotationKeys := make([]string, 0, len(image.Spec.Annotations))
for k := range image.Spec.Annotations {
annotationKeys = append(annotationKeys, k)
}
sort.Strings(annotationKeys)
for _, k := range annotationKeys {
annotations = append(annotations, kubecontainer.Annotation{
Name: k,
Value: v,
Value: image.Spec.Annotations[k],
})
}
}