Merge pull request #14 from kubernetes-sigs/main

Sync main -> release-0.2

Author: k8s-ci-robot

hack/Dockerfile.in

@@ -34,7 +34,7 @@ LABEL description="COSI {{COMPONENT}}"
 
 LABEL org.opencontainers.image.title="COSI {{COMPONENT}}"
 LABEL org.opencontainers.image.description="Container Object Storage Interface (COSI) {{COMPONENT}}"
-LABEL org.opencontainers.image.source="https://github.com/kubernetes-sigs/container-object-storage-interface-api/{{COMPONENT}}"
+LABEL org.opencontainers.image.source="https://github.com/kubernetes-sigs/container-object-storage-interface/{{COMPONENT}}"
 LABEL org.opencontainers.image.licenses="APACHE-2.0"
 
 WORKDIR /

hack/cloudbuild.sh

@@ -22,25 +22,50 @@ export PLATFORM
 export SIDECAR_TAG="${SIDECAR_IMAGE}:${GIT_TAG}"
 export CONTROLLER_TAG="${CONTROLLER_IMAGE}:${GIT_TAG}"
 
-# build in parallel
 make build
 
-# add latest tag to just-built images
-gcloud container images add-tag "${CONTROLLER_TAG}" "${CONTROLLER_IMAGE}:latest"
-gcloud container images add-tag "${SIDECAR_TAG}" "${SIDECAR_IMAGE}:latest"
+# PULL_BASE_REF is 'main' for non-tagged commits on the main branch
+if [[ "${PULL_BASE_REF}" == main ]]; then
+  echo " ! ! ! this is a main branch build ! ! !"
+  # 'main' tag follows the main branch head
+  gcloud container images add-tag "${CONTROLLER_TAG}" "${CONTROLLER_IMAGE}:main"
+  gcloud container images add-tag "${SIDECAR_TAG}" "${SIDECAR_IMAGE}:main"
+  # 'latest' tag follows 'main' for easy use by developers
+  gcloud container images add-tag "${CONTROLLER_TAG}" "${CONTROLLER_IMAGE}:latest"
+  gcloud container images add-tag "${SIDECAR_TAG}" "${SIDECAR_IMAGE}:latest"
+fi
+
+# PULL_BASE_REF is 'release-*' for non-tagged commits on release branches
+if [[ "${PULL_BASE_REF}" == release-* ]]; then
+  echo " ! ! ! this is a ${PULL_BASE_REF} release branch build ! ! !"
+  # 'release-*' tags that follow each release branch head
+  gcloud container images add-tag "${CONTROLLER_TAG}" "${CONTROLLER_IMAGE}:${PULL_BASE_REF}"
+  gcloud container images add-tag "${SIDECAR_TAG}" "${SIDECAR_IMAGE}:${PULL_BASE_REF}"
+fi
 
-# PULL_BASE_REF is 'controller/TAG' for a controller release
+# PULL_BASE_REF is 'controller/TAG' for a tagged controller release
 if [[ "${PULL_BASE_REF}" == controller/* ]]; then
   echo " ! ! ! this is a tagged controller release ! ! !"
   TAG="${PULL_BASE_REF#controller/*}"
   gcloud container images add-tag "${CONTROLLER_TAG}" "${CONTROLLER_IMAGE}:${TAG}"
 fi
 
-# PULL_BASE_REF is 'sidecar/TAG' for a controller release
+# PULL_BASE_REF is 'sidecar/TAG' for a tagged sidecar release
 if [[ "${PULL_BASE_REF}" == sidecar/* ]]; then
   echo " ! ! ! this is a tagged sidecar release ! ! !"
   TAG="${PULL_BASE_REF#sidecar/*}"
   gcloud container images add-tag "${SIDECAR_TAG}" "${SIDECAR_IMAGE}:${TAG}"
 fi
 
-# else, PULL_BASE_REF is a branch name (e.g., master, release-0.2) or a tag (e.g., client/v0.2.0, proto/v0.2.0)
+# PULL_BASE_REF is 'v0.y.z*' for tagged alpha releases where controller and sidecar are released simultaneously
+# hand wave over complex matching logic by just looking for 'v0.' prefix
+if [[ "${PULL_BASE_REF}" == 'v0.'* ]]; then
+  echo " ! ! ! this is a tagged controller + sidecar release ! ! !"
+  TAG="${PULL_BASE_REF}"
+  gcloud container images add-tag "${CONTROLLER_TAG}" "${CONTROLLER_IMAGE}:${TAG}"
+  gcloud container images add-tag "${SIDECAR_TAG}" "${SIDECAR_IMAGE}:${TAG}"
+fi
+
+# else, PULL_BASE_REF is something that doesn't release image(s) to staging, like:
+#  - a random branch name (e.g., feature-xyz)
+#  - a version tag for a subdir with no image associated (e.g., client/v0.2.0, proto/v0.2.0)