Skip to content

Commit

Permalink
pkg: validate: validate Username not empty in ImageStatus
Browse files Browse the repository at this point in the history
Kubernetes rely on that Username field to provide RunAsUser, we need to
validate runtimes correctly return it. We had recently an issue in
CRI-O for that.

Signed-off-by: Antonio Murdaca <[email protected]>
  • Loading branch information
runcom committed Feb 22, 2018
1 parent b256b8f commit 6445f59
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 0 deletions.
17 changes: 17 additions & 0 deletions images/image-user/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Copyright 2018 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

FROM busybox
ARG USER
USER ${USER}
24 changes: 24 additions & 0 deletions images/image-user/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright 2018 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

.PHONY: all test-image-user-list

all: test-image-user-list

TEST_USER = 1002 www-data 1003:users www-data:100
NLIST = $(shell for x in {1..$(words $(TEST_USER))}; do echo $$x; done)
IMAGES_LIST = test-image-user-uid test-image-user-username test-image-user-uid-group test-image-user-username-group
test-image-user-list:
$(foreach x,$(NLIST),docker build . -t gcr.io/cri-tools/$(word $(x),$(IMAGES_LIST)) --build-arg USER=$(word $(x),$(TEST_USER));)
$(foreach x,$(NLIST),gcloud docker -- push gcr.io/cri-tools/$(word $(x),$(IMAGES_LIST));)
12 changes: 12 additions & 0 deletions pkg/validate/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,18 @@ var _ = framework.KubeDescribe("Image Manager", func() {
})
})

It("image status get image fields should not have Uid empty [Conformance]", func() {
// runcom/imageuser has been built with a dockerfile having USER 1002
// we test that that user is returned in image status
framework.PullPublicImage(c, "runcom/imageuser")

defer removeImage(c, "runcom/imageuser")

status := framework.ImageStatus(c, "runcom/imageuser")
Expect(status.GetUid()).NotTo(BeNil(), "Image Uid should not be empty")
Expect(status.GetUid().GetValue()).To(Equal(int64(1002)), "Image Uid should be 1002")
})

It("listImage should get exactly 3 image in the result list [Conformance]", func() {
// different tags refer to different images
testImageList := []string{
Expand Down

0 comments on commit 6445f59

Please sign in to comment.