feat: add OCP bundle

- generate bundle using Makefile - build and push bundle using GH actions on new tag Signed-off-by: Alexander Maslennikov <[email protected]>
Mellanox · Dec 23, 2024 · 27c75af · 27c75af
1 parent b311edb
commit 27c75af
Show file tree

Hide file tree

Showing 17 changed files with 982 additions and 10 deletions.
diff --git a/.github/workflows/image-push-release.yml b/.github/workflows/image-push-release.yml
@@ -3,14 +3,17 @@ on:
   push:
     tags:
       - v*
+env:
+  REGISTRY: "ghcr.io"
+  OPERATOR_IMAGE_NAME: "maintenance-operator"
 jobs:
   image-build-push:
     name: Image build and push
     runs-on: ubuntu-latest
     steps:
-      - name: Set repository as lower-case output variable
-        id: repo_name
-        run: echo ::set-output name=repository::$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
+      - name: Set repository owner as lower-case output variable
+        id: repo_owner
+        run: echo REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
         with:
@@ -29,7 +32,7 @@ jobs:
         id: docker_meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/${{ steps.repo_name.outputs.repository }}
+          images: ${{ env.REGISTRY }}/${{ env.REPO_OWNER }}/${{ env.OPERATOR_IMAGE_NAME }}
           tags: |
             type=ref,event=tag
           flavor: |
@@ -44,3 +47,30 @@ jobs:
             ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
           file: ./Dockerfile
+      - name: Determine version, tag, and base branch
+        run: |
+          git_tag=${{ github.ref_name }}
+          echo VERSION_WITH_PREFIX=$git_tag        >> $GITHUB_ENV
+          echo VERSION_WITHOUT_PREFIX=${git_tag:1} >> $GITHUB_ENV  # without the 'v' prefix
+          if echo $git_tag | grep beta; then
+            base_branch=$DEFAULT_BRANCH
+          else
+            v_major_minor=$(echo $git_tag | grep -Eo '^v[0-9]+\.[0-9]+')
+            base_branch=$v_major_minor.x
+          fi
+          echo BASE_BRANCH=$base_branch >> $GITHUB_ENV
+      - name: Lookup image digest
+        run: |
+          operator_digest=$(skopeo inspect docker://$REGISTRY/$REPO_OWNER/$OPERATOR_IMAGE_NAME:$VERSION_WITH_PREFIX | jq -r .Digest)
+          echo $operator_digest | wc -w | grep 1  # verifies value not empty
+          echo OPERATOR_DIGEST=$operator_digest >> $GITHUB_ENV
+      - name: Make bundle
+        env:
+          IMG: ${{ env.REGISTRY }}/${{ env.REPO_OWNER }}/${{ env.OPERATOR_IMAGE_NAME }}@${{ env.OPERATOR_DIGEST }}
+          BUNDLE_IMG: ${{ env.REGISTRY }}/${{ env.REPO_OWNER }}/${{ env.OPERATOR_IMAGE_NAME }}-bundle:${{ github.ref_name }}
+          VERSION: ${{ env.VERSION_WITHOUT_PREFIX }}
+        run: |
+          version_major_minor=$(echo $VERSION_WITH_PREFIX | grep -Eo 'v[0-9]+\.[0-9]+')
+          export CHANNELS=stable,$version_major_minor
+          export DEFAULT_CHANNEL=$version_major_minor
+          make bundle bundle-build bundle-push
diff --git a/Makefile b/Makefile
@@ -49,6 +49,8 @@ ifeq ($(USE_IMAGE_DIGESTS), true)
 	BUNDLE_GEN_FLAGS += --use-image-digests
 endif
 
+BUNDLE_OCP_VERSIONS=v4.14-v4.17
+
 # 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.35.0
@@ -414,6 +416,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
 	$(OPERATOR_SDK) generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
+	echo "  com.redhat.openshift.versions: $(BUNDLE_OCP_VERSIONS)" >> bundle/metadata/annotations.yaml
 	$(OPERATOR_SDK) bundle validate ./bundle
 
 .PHONY: bundle-build

diff --git a/api/v1alpha1/maintenanceoperatorconfig_types.go b/api/v1alpha1/maintenanceoperatorconfig_types.go
@@ -58,14 +58,19 @@ type MaintenanceOperatorConfigSpec struct {
 	MaxNodeMaintenanceTimeSeconds int32 `json:"maxNodeMaintenanceTimeSeconds,omitempty"`
 }
 
+type MaintenanceOperatorConfigStatus struct {
+}
+
 //+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
 
 // MaintenanceOperatorConfig is the Schema for the maintenanceoperatorconfigs API
 type MaintenanceOperatorConfig struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec MaintenanceOperatorConfigSpec `json:"spec,omitempty"`
+	Spec   MaintenanceOperatorConfigSpec   `json:"spec,omitempty"`
+	Status MaintenanceOperatorConfigStatus `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/maintenance-operator-controller-manager-metrics-service_v1_service.yaml b/bundle/manifests/maintenance-operator-controller-manager-metrics-service_v1_service.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    app.kubernetes.io/component: kube-rbac-proxy
+    app.kubernetes.io/created-by: maintenance-operator
+    app.kubernetes.io/instance: controller-manager-metrics-service
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: service
+    app.kubernetes.io/part-of: maintenance-operator
+    control-plane: controller-manager
+  name: maintenance-operator-controller-manager-metrics-service
+spec:
+  ports:
+  - name: https
+    port: 8443
+    protocol: TCP
+    targetPort: https
+  selector:
+    control-plane: controller-manager
+status:
+  loadBalancer: {}
diff --git a/...nifests/maintenance-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...nifests/maintenance-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -0,0 +1,17 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  creationTimestamp: null
+  labels:
+    app.kubernetes.io/component: kube-rbac-proxy
+    app.kubernetes.io/created-by: maintenance-operator
+    app.kubernetes.io/instance: metrics-reader
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: clusterrole
+    app.kubernetes.io/part-of: maintenance-operator
+  name: maintenance-operator-metrics-reader
+rules:
+- nonResourceURLs:
+  - /metrics
+  verbs:
+  - get
diff --git a/bundle/manifests/maintenance-operator-webhook-service_v1_service.yaml b/bundle/manifests/maintenance-operator-webhook-service_v1_service.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    app.kubernetes.io/component: webhook
+    app.kubernetes.io/created-by: maintenance-operator
+    app.kubernetes.io/instance: webhook-service
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: service
+    app.kubernetes.io/part-of: maintenance-operator
+  name: maintenance-operator-webhook-service
+spec:
+  ports:
+  - port: 443
+    protocol: TCP
+    targetPort: 9443
+  selector:
+    control-plane: controller-manager
+status:
+  loadBalancer: {}