bump operator-sdk version

Author: dprince

.dockerignore

@@ -1,80 +1,4 @@
-ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.24
-ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest
-# Build the manager binary
-FROM $GOLANG_BUILDER AS builder
-
-#Arguments required by OSBS build system
-ARG CACHITO_ENV_FILE=/remote-source/cachito.env
-
-ARG REMOTE_SOURCE=.
-ARG REMOTE_SOURCE_DIR=/remote-source
-ARG REMOTE_SOURCE_SUBDIR=
-ARG DEST_ROOT=/dest-root
-
-ARG GO_BUILD_EXTRA_ARGS="-tags strictfipsruntime"
-ARG GO_BUILD_EXTRA_ENV_ARGS="CGO_ENABLED=1 GO111MODULE=on"
-
-COPY $REMOTE_SOURCE $REMOTE_SOURCE_DIR
-WORKDIR $REMOTE_SOURCE_DIR/$REMOTE_SOURCE_SUBDIR
-
-USER root
-RUN mkdir -p ${DEST_ROOT}/usr/local/bin/
-
-# cache deps before building and copying source so that we don't need to re-download as much
-# and so that source changes don't invalidate our downloaded layer
-RUN if [ ! -f $CACHITO_ENV_FILE ]; then go mod download ; fi
-
-# Build manager
-RUN if [ -f $CACHITO_ENV_FILE ] ; then source $CACHITO_ENV_FILE ; fi ; env ${GO_BUILD_EXTRA_ENV_ARGS} go build ${GO_BUILD_EXTRA_ARGS} -a -o ${DEST_ROOT}/manager main.go
-RUN if [ -f $CACHITO_ENV_FILE ] ; then source $CACHITO_ENV_FILE ; fi ; env ${GO_BUILD_EXTRA_ENV_ARGS} go build ${GO_BUILD_EXTRA_ARGS} -a -o ${DEST_ROOT}/operator cmd/operator/main.go
-
-RUN cp -r config/services ${DEST_ROOT}/services
-RUN cp -r bindata ${DEST_ROOT}/bindata
-
-# Use distroless as minimal base image to package the manager binary
-# Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM $OPERATOR_BASE_IMAGE
-
-ARG DEST_ROOT=/dest-root
-# NONROOT default id https://github.com/GoogleContainerTools/distroless/blob/main/base/base.bzl#L8=
-ARG USER_ID=65532
-
-ARG IMAGE_COMPONENT="openstack-operator-container"
-ARG IMAGE_NAME="openstack-operator"
-ARG IMAGE_VERSION="1.0.0"
-ARG IMAGE_SUMMARY="Openstack Operator"
-ARG IMAGE_DESC="This image includes the openstack-operator"
-ARG IMAGE_TAGS="cn-openstack openstack"
-
-### DO NOT EDIT LINES BELOW
-# Auto generated using CI tools from
-# https://github.com/openstack-k8s-operators/openstack-k8s-operators-ci
-
-# Labels required by upstream and osbs build system
-LABEL com.redhat.component="${IMAGE_COMPONENT}" \
-	name="${IMAGE_NAME}" \
-	version="${IMAGE_VERSION}" \
-	summary="${IMAGE_SUMMARY}" \
-	io.k8s.name="${IMAGE_NAME}" \
-	io.k8s.description="${IMAGE_DESC}" \
-	io.openshift.tags="${IMAGE_TAGS}"
-### DO NOT EDIT LINES ABOVE
-
-ENV USER_UID=$USER_ID \
-	OPERATOR_SERVICES=/usr/share/openstack-operator/services/
-
-WORKDIR /
-
-# Install operator binary to WORKDIR
-COPY --from=builder ${DEST_ROOT}/manager .
-COPY --from=builder ${DEST_ROOT}/operator .
-
-# Install services
-COPY --from=builder ${DEST_ROOT}/services ${OPERATOR_SERVICES}
-COPY --from=builder ${DEST_ROOT}/bindata /bindata
-
-USER $USER_ID
-
-ENV PATH="/:${PATH}"
-
-ENTRYPOINT ["/manager"]
+# More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
+# Ignore build and test binaries.
+bin/
+testbin/

.github/workflows/build-openstack-operator.yaml

@@ -16,7 +16,7 @@ jobs:
     with:
       operator_name: openstack
       go_version: 1.24.x
-      operator_sdk_version: 1.31.0
+      operator_sdk_version: 1.41.1
       bundle_dockerfile: ./bundle.Dockerfile
       operator_version: 0.5.0
     secrets:

Dockerfile

@@ -25,7 +25,7 @@ RUN mkdir -p ${DEST_ROOT}/usr/local/bin/
 RUN if [ ! -f $CACHITO_ENV_FILE ]; then go mod download ; fi
 
 # Build manager
-RUN if [ -f $CACHITO_ENV_FILE ] ; then source $CACHITO_ENV_FILE ; fi ; env ${GO_BUILD_EXTRA_ENV_ARGS} go build ${GO_BUILD_EXTRA_ARGS} -a -o ${DEST_ROOT}/manager main.go
+RUN if [ -f $CACHITO_ENV_FILE ] ; then source $CACHITO_ENV_FILE ; fi ; env ${GO_BUILD_EXTRA_ENV_ARGS} go build ${GO_BUILD_EXTRA_ARGS} -a -o ${DEST_ROOT}/manager cmd/main.go
 RUN if [ -f $CACHITO_ENV_FILE ] ; then source $CACHITO_ENV_FILE ; fi ; env ${GO_BUILD_EXTRA_ENV_ARGS} go build ${GO_BUILD_EXTRA_ARGS} -a -o ${DEST_ROOT}/operator cmd/operator/main.go
 
 RUN cp -r config/services ${DEST_ROOT}/services

Makefile

@@ -50,7 +50,7 @@ endif
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.31.0
+OPERATOR_SDK_VERSION ?= v1.41.1
 
 # Image URL to use all building/pushing image targets
 DEFAULT_IMG ?= quay.io/openstack-k8s-operators/openstack-operator:latest
@@ -311,7 +311,7 @@ GINKGO_TESTS ?= ./tests/... ./api/client/... ./api/core/... ./api/dataplane/...
 KUTTL ?= $(LOCALBIN)/kubectl-kuttl
 
 ## Tool Versions
-KUSTOMIZE_VERSION ?= v5.5.0 #(dprince: bumped to aquire new features like --load-restrictor)
+KUSTOMIZE_VERSION ?= v5.6.0 #(dprince: bumped to aquire new features like --load-restrictor)
 CONTROLLER_TOOLS_VERSION ?= v0.18.0
 CRD_MARKDOWN_VERSION ?= v0.0.3
 KUTTL_VERSION ?= 0.17.0

config/operator/deployment/kustomization.yaml

@@ -0,0 +1,16 @@
+resources:
+- deployment.yaml
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+configMapGenerator:
+- files:
+  - controller_operator_config.yaml
+  name: operator-config
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: controller
+  newName: quay.io/openstack-k8s-operators/openstack-operator
+  newTag: latest