From 8d9da156ead8610529692355b410583890d2138d Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Wed, 22 Jan 2025 12:51:32 -0800 Subject: [PATCH] feat: rebuild objectstorage-controller image --- objectstorage-controller/Dockerfile | 9 +++++++++ objectstorage-controller/Makefile | 17 +++++++++++++++++ objectstorage-controller/README.md | 11 +++++++++++ 3 files changed, 37 insertions(+) create mode 100644 objectstorage-controller/Dockerfile create mode 100644 objectstorage-controller/Makefile create mode 100644 objectstorage-controller/README.md diff --git a/objectstorage-controller/Dockerfile b/objectstorage-controller/Dockerfile new file mode 100644 index 0000000..12e4d0e --- /dev/null +++ b/objectstorage-controller/Dockerfile @@ -0,0 +1,9 @@ +# syntax=docker/dockerfile:1 + +# From image should be `gcr.io/k8s-staging-sig-storage/objectstorage-controller`. +ARG SOURCE_IMAGE + +FROM ${SOURCE_IMAGE} + +# Same ENTRYPOINT as in the SOURCE_IMAGE +ENTRYPOINT ["/controller"] \ No newline at end of file diff --git a/objectstorage-controller/Makefile b/objectstorage-controller/Makefile new file mode 100644 index 0000000..b39bc8c --- /dev/null +++ b/objectstorage-controller/Makefile @@ -0,0 +1,17 @@ +SOURCE_IMAGE_REPO ?= gcr.io/k8s-staging-sig-storage/objectstorage-controller +SOURCE_IMAGE_VERSION ?= v20250110-a29e5f6 +SOURCE_IMAGE ?= $(SOURCE_IMAGE_REPO):$(SOURCE_IMAGE_VERSION) + +TARGET_IMAGE_REPO ?= ghcr.io/mesosphere/dkp-container-images/objectstorage-controller +TARGET_IMAGE_VERSION ?= $(SOURCE_IMAGE_VERSION) +TARGET_IMAGE ?= $(TARGET_IMAGE_REPO):$(TARGET_IMAGE_VERSION) + +.PHONY: docker-build +docker-build: + docker build --build-arg="SOURCE_IMAGE=$(SOURCE_IMAGE)" -t $(TARGET_IMAGE) . + +.PHONY: build-args +build-args: + @echo "SOURCE_IMAGE=$(SOURCE_IMAGE)" + @echo "TARGET_IMAGE=$(TARGET_IMAGE)" + @echo "TARGET_IMAGE_VERSION=$(TARGET_IMAGE_VERSION)" diff --git a/objectstorage-controller/README.md b/objectstorage-controller/README.md new file mode 100644 index 0000000..04bbf24 --- /dev/null +++ b/objectstorage-controller/README.md @@ -0,0 +1,11 @@ +# objectstorage-controller + +A custom build of `gcr.io/k8s-staging-sig-storage/objectstorage-controller:` container image. The registry hosting this image is being shut down https://console.cloud.google.com/gcr/images/k8s-staging-sig-storage/global/objectstorage-controller. + +The Dockerile will be based on the upstream project https://github.com/kubernetes-sigs/container-object-storage-interface/blob/main/controller/Dockerfile. + +## Build + +```shell +make docker-build +```