Merge pull request #1110 from stuggi/operator_sdk_1.41.1

bump operator-sdk to 1.41.1

Author: openshift-merge-bot[bot]

.ci-operator.yaml

@@ -2,4 +2,4 @@
 build_root_image:
   name: tools
   namespace: openstack-k8s-operators
-  tag: ci-build-root-golang-1.20-sdk-1.31
+  tag: ci-build-root-golang-1.24-sdk-1.41.1

Makefile

@@ -120,7 +120,7 @@ OPENSTACK_BUNDLE_IMG         ?= quay.io/openstack-k8s-operators/openstack-operat
 OPENSTACK_STORAGE_BUNDLE_IMG ?= quay.io/openstack-k8s-operators/openstack-operator-storage-bundle:${OPENSTACK_K8S_TAG}
 OPENSTACK_CRDS_DIR           ?= openstack_crds
 OPENSTACK_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/openstack-operator/kuttl-test.yaml
-OPENSTACK_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/openstack-operator/tests/kuttl/tests
+OPENSTACK_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/openstack-operator/test/kuttl/tests
 OPENSTACK_KUTTL_NAMESPACE ?= openstack-kuttl-tests
 
 # Infra Operator
@@ -129,7 +129,7 @@ INFRA_REPO            ?= https://github.com/openstack-k8s-operators/infra-operat
 INFRA_BRANCH          ?= ${OPENSTACK_K8S_BRANCH}
 INFRA_COMMIT_HASH     ?=
 INFRA_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/infra-operator/kuttl-test.yaml
-INFRA_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/infra-operator/tests/kuttl/tests
+INFRA_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/infra-operator/test/kuttl/tests
 INFRA_KUTTL_NAMESPACE ?= infra-kuttl-tests
 
 # DNS
@@ -160,7 +160,7 @@ KEYSTONEAPI              ?= config/samples/keystone_v1beta1_keystoneapi.yaml
 KEYSTONEAPI_CR           ?= ${OPERATOR_BASE_DIR}/keystone-operator/${KEYSTONEAPI}
 KEYSTONEAPI_DEPL_IMG     ?= unused
 KEYSTONE_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/keystone-operator/kuttl-test.yaml
-KEYSTONE_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/keystone-operator/tests/kuttl/tests
+KEYSTONE_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/keystone-operator/test/kuttl/tests
 KEYSTONE_KUTTL_NAMESPACE ?= keystone-kuttl-tests
 
 # Barbican
@@ -172,7 +172,7 @@ BARBICAN                 ?= config/samples/barbican_v1beta1_barbican.yaml
 BARBICAN_CR              ?= ${OPERATOR_BASE_DIR}/barbican-operator/${BARBICAN}
 BARBICAN_DEPL_IMG        ?= unused
 BARBICAN_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/barbican-operator/kuttl-test.yaml
-BARBICAN_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/barbican-operator/tests/kuttl/tests
+BARBICAN_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/barbican-operator/test/kuttl/tests
 BARBICAN_KUTTL_NAMESPACE ?= barbican-kuttl-tests
 
 # Mariadb
@@ -188,10 +188,10 @@ endif
 MARIADB_CR                 ?= ${OPERATOR_BASE_DIR}/mariadb-operator/${MARIADB}
 MARIADB_DEPL_IMG           ?= unused
 MARIADB_KUTTL_CONF         ?= ${OPERATOR_BASE_DIR}/mariadb-operator/kuttl-test.yaml
-MARIADB_KUTTL_DIR          ?= ${OPERATOR_BASE_DIR}/mariadb-operator/tests/kuttl/tests
+MARIADB_KUTTL_DIR          ?= ${OPERATOR_BASE_DIR}/mariadb-operator/test/kuttl/tests
 MARIADB_KUTTL_NAMESPACE    ?= mariadb-kuttl-tests
-MARIADB_CHAINSAW_CONF      ?= ${OPERATOR_BASE_DIR}/mariadb-operator/tests/chainsaw/config.yaml
-MARIADB_CHAINSAW_DIR       ?= ${OPERATOR_BASE_DIR}/mariadb-operator/tests/chainsaw/tests
+MARIADB_CHAINSAW_CONF      ?= ${OPERATOR_BASE_DIR}/mariadb-operator/test/chainsaw/config.yaml
+MARIADB_CHAINSAW_DIR       ?= ${OPERATOR_BASE_DIR}/mariadb-operator/test/chainsaw/tests
 MARIADB_CHAINSAW_NAMESPACE ?= mariadb-chainsaw-tests
 
 # Placement
@@ -203,7 +203,7 @@ PLACEMENTAPI              ?= config/samples/placement_v1beta1_placementapi.yaml
 PLACEMENTAPI_CR           ?= ${OPERATOR_BASE_DIR}/placement-operator/${PLACEMENTAPI}
 PLACEMENTAPI_DEPL_IMG     ?= unused
 PLACEMENT_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/placement-operator/kuttl-test.yaml
-PLACEMENT_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/placement-operator/tests/kuttl/tests
+PLACEMENT_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/placement-operator/test/kuttl/tests
 PLACEMENT_KUTTL_NAMESPACE ?= placement-kuttl-tests
 
 # Sir Glancealot
@@ -232,7 +232,7 @@ OVNCONTROLLER_CR    ?= ${OPERATOR_BASE_DIR}/ovn-operator/${OVNCONTROLLER}
 OVNCONTROLLER_NMAP  ?= ${NETWORK_ISOLATION}
 # TODO: Image customizations for all OVN services
 OVN_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/ovn-operator/kuttl-test.yaml
-OVN_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/ovn-operator/tests/kuttl/tests
+OVN_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/ovn-operator/test/kuttl/tests
 OVN_KUTTL_NAMESPACE ?= ovn-kuttl-tests
 
 # Neutron
@@ -302,7 +302,7 @@ IRONICPXE_DEPL_IMG     ?= unused
 IRONICINS_DEPL_IMG     ?= unused
 IRONICNAG_DEPL_IMG     ?= unused
 IRONIC_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/ironic-operator/kuttl-test.yaml
-IRONIC_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/ironic-operator/tests/kuttl/tests
+IRONIC_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/ironic-operator/test/kuttl/tests
 IRONIC_KUTTL_NAMESPACE ?= ironic-kuttl-tests
 
 # Octavia
@@ -314,7 +314,7 @@ OCTAVIA                 ?= config/samples/octavia_v1beta1_octavia.yaml
 OCTAVIA_CR              ?= ${OPERATOR_BASE_DIR}/octavia-operator/${OCTAVIA}
 # TODO: Image custom    izations for all Octavia services
 OCTAVIA_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/octavia-operator/kuttl-test.yaml
-OCTAVIA_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/octavia-operator/tests/kuttl/tests
+OCTAVIA_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/octavia-operator/test/kuttl/tests
 OCTAVIA_KUTTL_NAMESPACE ?= octavia-kuttl-tests
 
 # Designate
@@ -325,7 +325,7 @@ DESIGNATE_COMMIT_HASH     ?=
 DESIGNATE                 ?= config/samples/designate_v1beta1_designate.yaml
 DESIGNATE_CR              ?= ${OPERATOR_BASE_DIR}/designate-operator/${DESIGNATE}
 DESIGNATE_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/designate-operator/kuttl-test.yaml
-DESIGNATE_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/designate-operator/tests/kuttl/tests
+DESIGNATE_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/designate-operator/test/kuttl/tests
 DESIGNATE_KUTTL_NAMESPACE ?= designate-kuttl-tests
 
 # Nova
@@ -351,7 +351,7 @@ HORIZON_CR              ?= ${OPERATOR_BASE_DIR}/horizon-operator/${HORIZON}
 HORIZON_DEPL_IMG        ?= unused
 HORIZON_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/horizon-operator/kuttl-test.yaml
 HORIZON_KUTTL_NAMESPACE ?= horizon-kuttl-tests
-HORIZON_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/horizon-operator/tests/kuttl/tests
+HORIZON_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/horizon-operator/test/kuttl/tests
 
 # Heat
 HEAT_IMG             ?= quay.io/openstack-k8s-operators/heat-operator-index:${OPENSTACK_K8S_TAG}
@@ -364,7 +364,7 @@ HEATAPI_DEPL_IMG     ?= unused
 HEATCFNAPI_DEPL_IMG  ?= unused
 HEATENGINE_DEPL_IMG  ?= unused
 HEAT_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/heat-operator/kuttl-test.yaml
-HEAT_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/heat-operator/tests/kuttl/tests
+HEAT_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/heat-operator/test/kuttl/tests
 HEAT_KUTTL_NAMESPACE ?= heat-kuttl-tests
 
 # AnsibleEE
@@ -375,7 +375,7 @@ ANSIBLEE_COMMIT_HASH      ?=
 ANSIBLEEE                 ?= config/samples/_v1beta1_ansibleee.yaml
 ANSIBLEEE_CR              ?= ${OPERATOR_BASE_DIR}/openstack-ansibleee-operator/${ANSIBLEEE}
 ANSIBLEEE_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/openstack-ansibleee-operator/kuttl-test.yaml
-ANSIBLEEE_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/openstack-ansibleee-operator/tests/kuttl/tests
+ANSIBLEEE_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/openstack-ansibleee-operator/test/kuttl/tests
 ANSIBLEEE_KUTTL_NAMESPACE ?= ansibleee-kuttl-tests
 
 
@@ -501,9 +501,10 @@ CEILOMETER_CENTRAL_DEPL_IMG      ?= unused
 CEILOMETER_NOTIFICATION_DEPL_IMG ?= unused
 SG_CORE_DEPL_IMG                 ?= unused
 TELEMETRY_KUTTL_BASEDIR   ?= ${OPERATOR_BASE_DIR}/telemetry-operator
-TELEMETRY_KUTTL_RELPATH   ?= tests/kuttl/suites
+TELEMETRY_KUTTL_RELPATH   ?= test/kuttl/suites
 TELEMETRY_KUTTL_CONF      ?= ${TELEMETRY_KUTTL_BASEDIR}/kuttl-test.yaml
 TELEMETRY_KUTTL_NAMESPACE ?= telemetry-kuttl-tests
+TELEMETRY_KUTTL_DIR       ?= ${TELEMETRY_KUTTL_BASEDIR}/${TELEMETRY_KUTTL_RELPATH}
 
 # BMO
 BMO_REPO                         ?= https://github.com/metal3-io/baremetal-operator
@@ -528,7 +529,7 @@ SWIFT_COMMIT_HASH       ?=
 SWIFT                   ?= config/samples/swift_v1beta1_swift.yaml
 SWIFT_CR                ?= ${OPERATOR_BASE_DIR}/swift-operator/${SWIFT}
 SWIFT_KUTTL_CONF        ?= ${OPERATOR_BASE_DIR}/swift-operator/kuttl-test.yaml
-SWIFT_KUTTL_DIR         ?= ${OPERATOR_BASE_DIR}/swift-operator/tests/kuttl/tests
+SWIFT_KUTTL_DIR         ?= ${OPERATOR_BASE_DIR}/swift-operator/test/kuttl/tests
 SWIFT_KUTTL_NAMESPACE   ?= swift-kuttl-tests
 
 # CertManager
@@ -1776,7 +1777,7 @@ nova_deploy_cleanup: namespace ## cleans up the service instance, Does not affec
 
 .PHONY: mariadb_kuttl_run
 mariadb_kuttl_run: ## runs kuttl tests for the mariadb operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${MARIADB_KUTTL_CONF} ${MARIADB_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	MARIADB_KUTTL_DIR=${MARIADB_KUTTL_DIR} kubectl-kuttl test --config ${MARIADB_KUTTL_CONF} ${MARIADB_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: mariadb_kuttl
 mariadb_kuttl: export NAMESPACE = ${MARIADB_KUTTL_NAMESPACE}
@@ -1852,7 +1853,7 @@ placement_kuttl: kuttl_common_prep placement placement_deploy_prep ## runs kuttl
 
 .PHONY: cinder_kuttl_run
 cinder_kuttl_run: ## runs kuttl tests for the cinder operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${CINDER_KUTTL_CONF} ${CINDER_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	CINDER_KUTTL_DIR=${CINDER_KUTTL_DIR} kubectl-kuttl test --config ${CINDER_KUTTL_CONF} ${CINDER_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: cinder_kuttl
 cinder_kuttl: export NAMESPACE = ${CINDER_KUTTL_NAMESPACE}
@@ -1867,7 +1868,7 @@ cinder_kuttl: kuttl_common_prep cinder cinder_deploy_prep ## runs kuttl tests fo
 
 .PHONY: neutron_kuttl_run
 neutron_kuttl_run: ## runs kuttl tests for the neutron operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${NEUTRON_KUTTL_CONF} ${NEUTRON_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	NEUTRON_KUTTL_DIR=${NEUTRON_KUTTL_DIR} kubectl-kuttl test --config ${NEUTRON_KUTTL_CONF} ${NEUTRON_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: neutron_kuttl
 neutron_kuttl: export NAMESPACE = ${NEUTRON_KUTTL_NAMESPACE}
@@ -1883,7 +1884,7 @@ neutron_kuttl: kuttl_common_prep ovn ovn_deploy neutron neutron_deploy_prep ## r
 
 .PHONY: octavia_kuttl_run
 octavia_kuttl_run: ## runs kuttl tests for the octavia operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${OCTAVIA_KUTTL_CONF} ${OCTAVIA_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	OCTAVIA_KUTTL_DIR=${OCTAVIA_KUTTL_DIR} kubectl-kuttl test --config ${OCTAVIA_KUTTL_CONF} ${OCTAVIA_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: octavia_kuttl
 octavia_kuttl: export NAMESPACE = ${OCTAVIA_KUTTL_NAMESPACE}
@@ -1917,11 +1918,11 @@ designate_kuttl: kuttl_common_prep ovn ovn_deploy redis_deploy_prep designate de
 
 .PHONY: designate_kuttl_run
 designate_kuttl_run: ## runs kuttl tests for the designate operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${DESIGNATE_KUTTL_CONF} ${DESIGNATE_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	DESIGNATE_KUTTL_DIR=${DESIGNATE_KUTTL_DIR} kubectl-kuttl test --config ${DESIGNATE_KUTTL_CONF} ${DESIGNATE_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: ovn_kuttl_run
 ovn_kuttl_run: ## runs kuttl tests for the ovn operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${OVN_KUTTL_CONF} ${OVN_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	OVN_KUTTL_DIR=${OVN_KUTTL_DIR} kubectl-kuttl test --config ${OVN_KUTTL_CONF} ${OVN_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: ovn_kuttl
 ovn_kuttl: export NAMESPACE = ${OVN_KUTTL_NAMESPACE}
@@ -1938,7 +1939,7 @@ ovn_kuttl: input deploy_cleanup infra ovn ovn_deploy_prep ## runs kuttl tests fo
 
 .PHONY: infra_kuttl_run
 infra_kuttl_run: ## runs kuttl tests for the infra operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${INFRA_KUTTL_CONF} ${INFRA_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	INFRA_KUTTL_DIR=${INFRA_KUTTL_DIR} kubectl-kuttl test --config ${INFRA_KUTTL_CONF} ${INFRA_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: infra_kuttl
 infra_kuttl: export NAMESPACE = ${INFRA_KUTTL_NAMESPACE}
@@ -1954,7 +1955,7 @@ infra_kuttl: input deploy_cleanup rabbitmq rabbitmq_deploy infra memcached_deplo
 
 .PHONY: ironic_kuttl_run
 ironic_kuttl_run: ## runs kuttl tests for the ironic operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${IRONIC_KUTTL_CONF} ${IRONIC_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	IRONIC_KUTTL_DIR=${IRONIC_KUTTL_DIR} kubectl-kuttl test --config ${IRONIC_KUTTL_CONF} ${IRONIC_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: ironic_kuttl
 ironic_kuttl: export NAMESPACE = ${IRONIC_KUTTL_NAMESPACE}
@@ -1971,7 +1972,7 @@ ironic_kuttl_crc: crc_storage ironic_kuttl
 
 .PHONY: heat_kuttl_run
 heat_kuttl_run: ## runs kuttl tests for the heat operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${HEAT_KUTTL_CONF} ${HEAT_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	HEAT_KUTTL_DIR=${HEAT_KUTTL_DIR} kubectl-kuttl test --config ${HEAT_KUTTL_CONF} ${HEAT_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: heat_kuttl
 heat_kuttl: export NAMESPACE = ${HEAT_KUTTL_NAMESPACE}
@@ -1990,7 +1991,7 @@ heat_kuttl_crc: crc_storage heat_kuttl
 
 .PHONY: ansibleee_kuttl_run
 ansibleee_kuttl_run: ## runs kuttl tests for the openstack-ansibleee operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${ANSIBLEEE_KUTTL_CONF} ${ANSIBLEEE_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	ANDIBLEEE_KUTTL_DIR=${ANSIBLEEE_KUTTL_DIR} kubectl-kuttl test --config ${ANSIBLEEE_KUTTL_CONF} ${ANSIBLEEE_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: ansibleee_kuttl_cleanup
 ansibleee_kuttl_cleanup:
@@ -2017,7 +2018,7 @@ ansibleee_kuttl: input ansibleee_kuttl_prep ansibleee ## runs kuttl tests for th
 
 .PHONY: glance_kuttl_run
 glance_kuttl_run: ## runs kuttl tests for the glance operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${GLANCE_KUTTL_CONF} ${GLANCE_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	GLANCE_KUTTL_DIR=${GLANCE_KUTTL_DIR} kubectl-kuttl test --config ${GLANCE_KUTTL_CONF} ${GLANCE_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: glance_kuttl
 glance_kuttl: export NAMESPACE = ${GLANCE_KUTTL_NAMESPACE}
@@ -2034,7 +2035,7 @@ glance_kuttl: kuttl_common_prep horizon swift swift_deploy glance glance_deploy_
 
 .PHONY: manila_kuttl_run
 manila_kuttl_run: ## runs kuttl tests for the manila operator,
-	kubectl-kuttl test --config ${MANILA_KUTTL_CONF} ${MANILA_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	MANILA_KUTTL_DIR=${MANILA_KUTTL_DIR} kubectl-kuttl test --config ${MANILA_KUTTL_CONF} ${MANILA_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: manila_kuttl
 manila_kuttl: export NAMESPACE = ${MANILA_KUTTL_NAMESPACE}
@@ -2051,7 +2052,7 @@ manila_kuttl: kuttl_common_prep ceph manila manila_deploy_prep ## runs kuttl tes
 
 .PHONY: swift_kuttl_run
 swift_kuttl_run: ## runs kuttl tests for the swift operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${SWIFT_KUTTL_CONF} ${SWIFT_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	SWIFT_KUTTL_DIR=${SWIFT_KUTTL_DIR} kubectl-kuttl test --config ${SWIFT_KUTTL_CONF} ${SWIFT_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: swift_kuttl
 swift_kuttl: export NAMESPACE = ${SWIFT_KUTTL_NAMESPACE}
@@ -2067,7 +2068,7 @@ swift_kuttl: kuttl_common_prep barbican barbican_deploy swift swift_deploy_prep
 
 .PHONY: horizon_kuttl_run
 horizon_kuttl_run: ## runs kuttl tests for the horizon operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${HORIZON_KUTTL_CONF} ${HORIZON_KUTTL_DIR} --config ${HORIZON_KUTTL_CONF} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	HORIZON_KUTTL_DIR=${HORIZON_KUTTL_DIR} kubectl-kuttl test --config ${HORIZON_KUTTL_CONF} ${HORIZON_KUTTL_DIR} --config ${HORIZON_KUTTL_CONF} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: horizon_kuttl
 horizon_kuttl: export NAMESPACE = ${HORIZON_KUTTL_NAMESPACE}
@@ -2734,7 +2735,7 @@ telemetry_deploy_cleanup: ## cleans up the service instance, Does not affect the
 
 .PHONY: telemetry_kuttl_run
 telemetry_kuttl_run: ## runs kuttl tests for the telemetry operator, assumes that everything needed for running the test was deployed beforehand.
-	kubectl-kuttl test --config ${TELEMETRY_KUTTL_CONF} --namespace ${NAMESPACE} $(KUTTL_ARGS)
+	TELEMETRY_KUTTL_DIR=${TELEMETRY_KUTTL_DIR} kubectl-kuttl test --config ${TELEMETRY_KUTTL_CONF} ${TELEMETRY_KUTTL_DIR} --namespace ${NAMESPACE} $(KUTTL_ARGS)
 
 .PHONY: telemetry_kuttl
 telemetry_kuttl: export NAMESPACE = ${TELEMETRY_KUTTL_NAMESPACE}

devsetup/roles/download_tools/defaults/main.yaml

@@ -6,7 +6,7 @@ kuttl_version: 0.20.0
 opm_version: latest
 
 # operator-sdk version to use (must be specific version)
-sdk_version: v1.31.0
+sdk_version: v1.41.1
 
 # golang version
 go_version: 1.24.6

devsetup/vars/default.yaml

@@ -3,7 +3,7 @@
 opm_version: v1.30.0
 
 # operator-sdk version to use (must be specific version)
-sdk_version: v1.31.0
+sdk_version: v1.41.1
 
 # golang version
 go_version: 1.24.6

zuul.d/projects.yaml

@@ -3,7 +3,9 @@
     name: openstack-k8s-operators/install_yamls
     github-check:
       jobs:
-        - openstack-k8s-operators-content-provider
+        - openstack-k8s-operators-content-provider:
+            vars:
+              cifmw_install_yamls_sdk_version: v1.41.1
         - install-yamls-crc-podified-edpm-baremetal: &content_provider
             dependencies:
               - openstack-k8s-operators-content-provider