feat: build kubectl UBI based image (#730)

* feat: build kubectl UBI based image Signed-off-by: Dominik Rosiek <[email protected]> * chore: build dev-builds Signed-off-by: Dominik Rosiek <[email protected]> * chore: add io.k8s.description label Signed-off-by: Dominik Rosiek <[email protected]> * chore: fix override Signed-off-by: Dominik Rosiek <[email protected]> --------- Signed-off-by: Dominik Rosiek <[email protected]>
SumoLogic · May 27, 2024 · 4d9b9e1 · 4d9b9e1
1 parent 0d1e663
commit 4d9b9e1
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 4 deletions.
diff --git a/.github/workflows/dev_builds.yml b/.github/workflows/dev_builds.yml
@@ -4,7 +4,8 @@ on:
   push:
     branches:
       - main
-      - 'release-v[0-9]+.[0-9]+'
+      - "release-v[0-9]+.[0-9]+"
+      - "dev-build/*"
 
 jobs:
   extract-image-tag:
@@ -45,6 +46,17 @@ jobs:
       DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD_KUBECTL }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
+  build-and-push-image-kubectl-ubi:
+    uses: ./.github/workflows/build_and_push_image.yml
+    needs: extract-image-tag
+    with:
+      build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
+      suffix: kubectl-ubi
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKERHUB_LOGIN_KUBECTL }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD_KUBECTL }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
   build-and-push-image-sumologic-mock:
     uses: ./.github/workflows/build_and_push_image.yml
     needs: extract-image-tag

diff --git a/.github/workflows/pre_release_builds.yml b/.github/workflows/pre_release_builds.yml
@@ -41,6 +41,17 @@ jobs:
       DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD_KUBECTL }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
+  build-and-push-image-kubectl-ubi:
+    uses: ./.github/workflows/build_and_push_image.yml
+    needs: extract-image-tag
+    with:
+      build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
+      suffix: kubectl-ubi
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKERHUB_LOGIN_KUBECTL }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD_KUBECTL }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
   build-and-push-image-sumologic-mock:
     uses: ./.github/workflows/build_and_push_image.yml
     needs: extract-image-tag

diff --git a/.github/workflows/release_builds.yml b/.github/workflows/release_builds.yml
@@ -3,7 +3,7 @@ name: Release builds
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - "v[0-9]+.[0-9]+.[0-9]+"
 
 jobs:
   extract-image-tag:
@@ -41,6 +41,18 @@ jobs:
       DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD_KUBECTL }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
+  build-and-push-image-kubectl-ubi:
+    uses: ./.github/workflows/build_and_push_image.yml
+    needs: extract-image-tag
+    with:
+      build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
+      tag_latest: true
+      suffix: kubectl-ubi
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKERHUB_LOGIN_KUBECTL }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD_KUBECTL }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
   build-and-push-image-sumologic-mock:
     uses: ./.github/workflows/build_and_push_image.yml
     needs: extract-image-tag

diff --git a/Dockerfile.kubectl-ubi b/Dockerfile.kubectl-ubi
@@ -0,0 +1,26 @@
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
+
+ARG TARGETARCH
+ARG TARGETOS
+ARG BUILD_TAG
+
+ENV KUBECTL_VERSION="v1.26.4"
+ADD https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/${TARGETOS}/${TARGETARCH}/kubectl /usr/bin/kubectl
+RUN chmod +x /usr/bin/kubectl
+
+ENV SUMMARY="UBI based Kubectl Sumo Logic Tools image" \
+    DESCRIPTION="Sumo Logic Tools image containing kubectl binary"
+
+LABEL name="Sumo Logic Kubernetes tools" \
+    vendor="Sumo Logic" \
+    version="${BUILD_TAG}" \
+    release="1" \
+    summary="$SUMMARY" \
+    description="$DESCRIPTION" \
+    io.k8s.description="$DESCRIPTION" \
+    maintainer="[email protected]"
+
+ADD LICENSE \
+    /licenses/LICENSE
+
+USER 65532:65532
diff --git a/Makefile b/Makefile
@@ -38,25 +38,31 @@ delete-remote-tag:
 	@echo "Deleting remote tag ${TAG}"
 	@git push --delete origin ${TAG}
 
-build-image: build-image-tools build-image-kubectl build-image-sumologic-mock
+build-image: build-image-tools build-image-kubectl build-image-kubectl-ubi build-image-sumologic-mock
 
 build-image-tools:
 	TAG=$(BUILD_TAG) docker buildx bake
 
 build-image-kubectl:
 	TAG=$(BUILD_TAG) docker buildx bake kubectl
 
+build-image-kubectl-ubi:
+	TAG=$(BUILD_TAG) docker buildx bake kubectl-ubi
+
 build-image-sumologic-mock:
 	TAG=$(BUILD_TAG) docker buildx bake sumologic-mock
 
-build-image-multiplatform: build-image-multiplatform-tools build-image-multiplatform-kubectl
+build-image-multiplatform: build-image-multiplatform-tools build-image-multiplatform-kubectl build-image-multiplatform-kubectl-ubi
 
 build-image-multiplatform-tools:
 	TAG=$(BUILD_TAG) docker buildx bake tools-multiplatform
 
 build-image-multiplatform-kubectl:
 	TAG=$(BUILD_TAG) docker buildx bake kubectl-multiplatform
 
+build-image-multiplatform-kubectl-ubi:
+	TAG=$(BUILD_TAG) docker buildx bake kubectl-ubi-multiplatform
+
 build-image-multiplatform-sumologic-mock:
 	TAG=$(BUILD_TAG) docker buildx bake sumologic-mock-multiplatform
 
@@ -66,6 +72,9 @@ tag-release-image-with-latest-tools:
 tag-release-image-with-latest-kubectl:
 	make push-image-kubectl BUILD_TAG=latest
 
+tag-release-image-with-latest-kubectl-ubi:
+	make push-image-kubectl-ubi BUILD_TAG=latest
+
 tag-release-image-with-latest-sumologic-mock:
 	make push-image-sumologic-mock BUILD_TAG=latest
 
@@ -75,6 +84,9 @@ tag-release-image-with-latest-ecr-tools:
 tag-release-image-with-latest-ecr-kubectl:
 	make tag-release-image-with-latest-kubectl REPO_URL=$(ECR_REPO_URL)
 
+tag-release-image-with-latest-ecr-kubectl-ubi:
+	make tag-release-image-with-latest-kubectl-ubi REPO_URL=$(ECR_REPO_URL)
+
 tag-release-image-with-latest-ecr-sumologic-mock:
 	make tag-release-image-with-latest-sumologic-mock SUMOLOGIC_MOCK_REPO_URL=$(SUMOLOGIC_MOCK_ECR_REPO_URL)
 
@@ -97,6 +109,9 @@ push-image-tools:
 push-image-kubectl:
 	IMAGE=$(REPO_URL) TAG=$(BUILD_TAG) docker buildx bake kubectl-multiplatform --push
 
+push-image-kubectl-ubi:
+	IMAGE=$(REPO_URL) TAG=$(BUILD_TAG) docker buildx bake kubectl-ubi-multiplatform --push
+
 push-image-sumologic-mock:
 	SUMOLOGIC_MOCK_IMAGE=$(SUMOLOGIC_MOCK_REPO_URL) TAG=$(BUILD_TAG) docker buildx bake sumologic-mock-multiplatform --push
 
@@ -106,6 +121,9 @@ push-image-ecr-tools:
 push-image-ecr-kubectl:
 	make push-image-kubectl REPO_URL=$(ECR_REPO_URL)
 
+push-image-ecr-kubectl-ubi:
+	make push-image-kubectl-ubi REPO_URL=$(ECR_REPO_URL)
+
 push-image-ecr-sumologic-mock:
 	make push-image-sumologic-mock SUMOLOGIC_MOCK_REPO_URL=$(SUMOLOGIC_MOCK_ECR_REPO_URL)
 

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -54,6 +54,16 @@ target "kubectl" {
     platforms = ["linux/amd64"]
 }
 
+target "kubectl-ubi" {
+    dockerfile = "Dockerfile.kubectl-ubi"
+    tags = ["${IMAGE}-kubectl:${TAG}-ubi"]
+    output = ["type=docker"]
+    platforms = ["linux/amd64"]
+    args = {
+        BUILD_TAG = "${TAG}"
+    }
+}
+
 target "tools-multiplatform" {
     inherits = ["default", "multiplatform"]
 }
@@ -62,6 +72,10 @@ target "kubectl-multiplatform" {
     inherits = ["kubectl", "multiplatform"]
 }
 
+target "kubectl-ubi-multiplatform" {
+    inherits = ["kubectl-ubi", "multiplatform"]
+}
+
 target "sumologic-mock" {
     dockerfile = "Dockerfile.sumologic-mock"
     tags = ["${SUMOLOGIC_MOCK_IMAGE}:${TAG}"]