Add metadate to Docker images

For troubleshooting it's useful to have following data:
* image build time
* git branch
* git revision

Also this commits modifies 'make image' target to build webhook image
too.

Dockerfile

@@ -4,6 +4,20 @@ COPY . .
 RUN make _build-manager BIN_PATH=build/_output/cmd
 
 FROM quay.io/centos/centos:stream9
+
+ARG BUILD_DATE
+ARG VERSION
+ARG VCS_REF
+ARG VCS_BRANCH
+
+LABEL version=$VERSION
+LABEL vcs-type="git"
+LABEL vcs-branch=$VCS_BRANCH
+LABEL vcs-ref=$VCS_REF
+LABEL build-date=$BUILD_DATE
+LABEL io.k8s.display-name="sriov-network-operator" \
+      io.k8s.description="Operator for provisioning and configuring SR-IOV CNI plugin and device plugin"
+
 COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/build/_output/cmd/manager /usr/bin/sriov-network-operator
 COPY bindata /bindata
 ENV OPERATOR_NAME=sriov-network-operator

Dockerfile.sriov-network-config-daemon

@@ -4,10 +4,22 @@ COPY . .
 RUN make _build-sriov-network-config-daemon BIN_PATH=build/_output/cmd
 
 FROM quay.io/centos/centos:stream9
-ARG MSTFLINT=mstflint
-RUN ARCH_DEP_PKGS=$(if [ "$(uname -m)" != "s390x" ]; then echo -n ${MSTFLINT} ; fi) && yum -y install hwdata $ARCH_DEP_PKGS && yum clean all
+
+ARG BUILD_DATE
+ARG VERSION
+ARG VCS_REF
+ARG VCS_BRANCH
+
+LABEL version=$VERSION
+LABEL vcs-type="git"
+LABEL vcs-branch=$VCS_BRANCH
+LABEL vcs-ref=$VCS_REF
+LABEL build-date=$BUILD_DATE
 LABEL io.k8s.display-name="sriov-network-config-daemon" \
       io.k8s.description="This is a daemon that manage and config sriov network devices in Kubernetes cluster"
+
+ARG MSTFLINT=mstflint
+RUN ARCH_DEP_PKGS=$(if [ "$(uname -m)" != "s390x" ]; then echo -n ${MSTFLINT} ; fi) && yum -y install hwdata $ARCH_DEP_PKGS && yum clean all
 COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/build/_output/cmd/sriov-network-config-daemon /usr/bin/
 COPY bindata /bindata
 CMD ["/usr/bin/sriov-network-config-daemon"]

Dockerfile.webhook

@@ -4,7 +4,19 @@ COPY . .
 RUN make _build-webhook BIN_PATH=build/_output/cmd
 
 FROM quay.io/centos/centos:stream9
+
+ARG BUILD_DATE
+ARG VERSION
+ARG VCS_REF
+ARG VCS_BRANCH
+
+LABEL version=$VERSION
+LABEL vcs-type="git"
+LABEL vcs-branch=$VCS_BRANCH
+LABEL vcs-ref=$VCS_REF
+LABEL build-date=$BUILD_DATE
 LABEL io.k8s.display-name="sriov-network-webhook" \
       io.k8s.description="This is an admission controller webhook that mutates and validates customer resources of sriov network operator."
+
 COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/sriov-network-operator/build/_output/cmd/webhook /usr/bin/webhook
 CMD ["/usr/bin/webhook"]

Makefile

@@ -14,6 +14,12 @@ IMAGE_BUILDER?=docker
 IMAGE_BUILD_OPTS?=
 DOCKERFILE?=Dockerfile
 DOCKERFILE_CONFIG_DAEMON?=Dockerfile.sriov-network-config-daemon
+DOCKERFILE_WEBHOOK?=Dockerfile.webhook
+
+BUILD_VERSION := $(strip $(shell [ -d .git ] && git describe --always --tags --dirty))
+BUILD_TIMESTAMP := $(shell date -u +"%Y-%m-%dT%H:%M:%S%Z")
+VCS_BRANCH := $(strip $(shell git rev-parse --abbrev-ref HEAD))
+VCS_REF := $(strip $(shell [ -d .git ] && git rev-parse --short HEAD))
 
 CRD_BASES=./config/crd/bases
 
@@ -22,6 +28,7 @@ TARGET=$(TARGET_DIR)/bin/$(APP_NAME)
 IMAGE_REPO?=ghcr.io/k8snetworkplumbingwg
 IMAGE_TAG?=$(IMAGE_REPO)/$(APP_NAME):latest
 CONFIG_DAEMON_IMAGE_TAG?=$(IMAGE_REPO)/sriov-network-config-daemon:latest
+WEBHOOK_IMAGE_TAG?=$(IMAGE_REPO)/sriov-network-operator-webhook:latest
 MAIN_PKG=cmd/manager/main.go
 export NAMESPACE?=openshift-sriov-network-operator
 export WATCH_NAMESPACE?=openshift-sriov-network-operator
@@ -69,8 +76,21 @@ update-codegen:
 	hack/update-codegen.sh
 
 image: ; $(info Building image...)
-	$(IMAGE_BUILDER) build -f $(DOCKERFILE) -t $(IMAGE_TAG) $(CURPATH) $(IMAGE_BUILD_OPTS)
-	$(IMAGE_BUILDER) build -f $(DOCKERFILE_CONFIG_DAEMON) -t $(CONFIG_DAEMON_IMAGE_TAG) $(CURPATH) $(IMAGE_BUILD_OPTS)
+	$(IMAGE_BUILDER) build  --build-arg BUILD_DATE="$(BUILD_TIMESTAMP)" \
+		--build-arg VERSION="$(BUILD_VERSION)" \
+		--build-arg VCS_REF="$(VCS_REF)" \
+		--build-arg VCS_BRANCH="$(VCS_BRANCH)" \
+		-f $(DOCKERFILE) -t $(IMAGE_TAG) $(CURPATH) $(IMAGE_BUILD_OPTS)
+	$(IMAGE_BUILDER) build --build-arg BUILD_DATE="$(BUILD_TIMESTAMP)" \
+		--build-arg VERSION="$(BUILD_VERSION)" \
+		--build-arg VCS_REF="$(VCS_REF)" \
+		--build-arg VCS_BRANCH="$(VCS_BRANCH)" \
+		-f $(DOCKERFILE_CONFIG_DAEMON) -t $(CONFIG_DAEMON_IMAGE_TAG) $(CURPATH) $(IMAGE_BUILD_OPTS)
+	$(IMAGE_BUILDER) build --build-arg BUILD_DATE="$(BUILD_TIMESTAMP)" \
+		--build-arg VERSION="$(BUILD_VERSION)" \
+		--build-arg VCS_REF="$(VCS_REF)" \
+		--build-arg VCS_BRANCH="$(VCS_BRANCH)" \
+		-f $(DOCKERFILE_WEBHOOK) -t $(WEBHOOK_IMAGE_TAG) $(CURPATH) $(IMAGE_BUILD_OPTS)
 
 # Run tests
 test: generate vet manifests envtest