From d6ca49bb9d94a54a6d294b3aca21a7038f7db16e Mon Sep 17 00:00:00 2001 From: Hyeongju Johannes Lee Date: Tue, 11 Feb 2025 21:26:14 +0200 Subject: [PATCH 1/3] operator: remove residue of scorecard Signed-off-by: Hyeongju Johannes Lee --- Makefile | 2 +- deployments/operator/manifests/kustomization.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bbe30ac9f..fd64a2b6f 100644 --- a/Makefile +++ b/Makefile @@ -126,7 +126,7 @@ bundle: rm manifests/*service.yaml rm manifests/*clusterrole.yaml # Put generated files in a directory - mv manifests metadata tests bundle.Dockerfile $(BUNDLE_DIR) + mv manifests metadata bundle.Dockerfile $(BUNDLE_DIR) $(OPERATOR_SDK) bundle validate $(BUNDLE_DIR)/ bundle-build: diff --git a/deployments/operator/manifests/kustomization.yaml b/deployments/operator/manifests/kustomization.yaml index 63ca74d72..ec2c16556 100644 --- a/deployments/operator/manifests/kustomization.yaml +++ b/deployments/operator/manifests/kustomization.yaml @@ -1,4 +1,3 @@ resources: - ../default - ../samples -- ../scorecard From b3459a4d1708026eef94daa226726bf143c7a398 Mon Sep 17 00:00:00 2001 From: Hyeongju Johannes Lee Date: Tue, 11 Feb 2025 21:42:52 +0200 Subject: [PATCH 2/3] operator: fix outdated information update documentation in DEVEL.md too Signed-off-by: Hyeongju Johannes Lee --- DEVEL.md | 4 +++- .../intel-device-plugins-operator.clusterserviceversion.yaml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/DEVEL.md b/DEVEL.md index f91b01fe4..17ae169ed 100644 --- a/DEVEL.md +++ b/DEVEL.md @@ -127,8 +127,10 @@ There are few useful steps when working with changes to Device Plugins CRDs and ### Publish a New Version of the Intel Device Plugins Operator to operatorhub.io Check if the fields mentioned below in the [base CSV manifest file](deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml) have the correct values. If not, fix them manually (operator-sdk does not support updating these fields in any other way). +- spec.maturity - spec.version - spec.replaces +- metadata.annotations.capabilities - metadata.annotations.containerImage - metadata.annotations.createdAT @@ -141,7 +143,7 @@ $ git clone https://github.com//community-operators Generate bundle and build bundle image: ``` -$ make bundle TAG=0.X.Y CHANNELS=alpha DEFAULT_CHANNEL=alpha +$ make bundle TAG=0.X.Y CHANNELS=stable DEFAULT_CHANNEL=stable $ make bundle-build ``` diff --git a/deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml b/deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml index 58b1397a2..54cabf1bf 100644 --- a/deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml +++ b/deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml @@ -3,7 +3,7 @@ kind: ClusterServiceVersion metadata: annotations: alm-examples: '[]' - capabilities: Seamless Upgrades + capabilities: Full Lifecycle categories: Drivers and plugins containerImage: docker.io/intel/intel-deviceplugin-operator:0.25.0 createdAt: "2022-11-09" @@ -117,7 +117,7 @@ spec: name: Hyeongju Lee - email: mikko.ylinen@intel.com name: Mikko Ylinen - maturity: alpha + maturity: stable minKubeVersion: 1.21.0 provider: name: Intel® Corporation From b1b03e696eb58f4b461ed37910a57d1d0c008f0e Mon Sep 17 00:00:00 2001 From: Hyeongju Johannes Lee Date: Tue, 18 Feb 2025 16:04:26 +0200 Subject: [PATCH 3/3] operator, kubebuilder: update to v4 Signed-off-by: Hyeongju Johannes Lee --- PROJECT | 2 +- .../intel-device-plugins-operator.clusterserviceversion.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PROJECT b/PROJECT index 708a35574..3335edecb 100644 --- a/PROJECT +++ b/PROJECT @@ -1,5 +1,5 @@ domain: intel.com -layout: go.kubebuilder.io/v2 +layout: go.kubebuilder.io/v4 multigroup: true projectName: intel-device-plugins-operator repo: github.com/intel/intel-device-plugins-for-kubernetes diff --git a/deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml b/deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml index 54cabf1bf..831b459da 100644 --- a/deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml +++ b/deployments/operator/manifests/bases/intel-device-plugins-operator.clusterserviceversion.yaml @@ -11,7 +11,7 @@ metadata: serve the installation and lifecycle management of Intel device plugins for Kubernetes. operators.operatorframework.io/builder: operator-sdk-v1.25.0 - operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 + operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 repository: https://github.com/intel/intel-device-plugins-for-kubernetes name: intel-device-plugins-operator.v0.25.0 namespace: placeholder