Merge pull request #130 from ArangoGutierrez/devel/make_bundle

Enable `make bundle`

Author: k8s-ci-robot

PROJECT

@@ -1,13 +1,18 @@
 domain: nodefeaturediscoveries.nfd.kubernetes.io
 layout: go.kubebuilder.io/v3
-projectName: node-feature-discovery-operator
+projectName: nfd-operator
 repo: github.com/kubernetes-sigs/node-feature-discovery-operator
 resources:
-- crdVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: nodefeaturediscoveries.nfd.kubernetes.io
   group: nfd.kubernetes.io
   kind: NodeFeatureDiscovery
+  path: github.com/kubernetes-sigs/node-feature-discovery-operator/api/v1
   version: v1
-version: 3-alpha
+version: "3"
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}

config/crd/kustomization.yaml

@@ -3,8 +3,8 @@
 # It should be run by config/default
 resources:
 - bases/nfd.kubernetes.io_nodefeaturediscoveries.yaml
-- bases/nfd.openshift.io_v1alpha1_nodefeaturerules.yaml
-- bases/node.k8s.io_v1alpha1_noderesoursetopologies.yaml
+- bases/nfd.kubernetes.io_v1alpha1_nodefeaturerules.yaml
+- bases/node.k8s.io_v1alpha1_noderesourcetopologies.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 commonAnnotations:

config/default/kustomization.yaml

@@ -13,67 +13,14 @@ namespace: node-feature-discovery-operator
 # field above.
 namePrefix: nfd-
 
-# Labels to add to all resources and selectors.
-#commonLabels:
-#  someName: someValue
-
 bases:
 - ../crd
 - ../rbac
 - ../manager
-# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
-# crd/kustomization.yaml
-#- ../webhook
-# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
-#- ../certmanager
-# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
-#- ../prometheus
+- ../prometheus
 
 patchesStrategicMerge:
 # Protect the /metrics endpoint by putting it behind auth.
 # If you want your controller-manager to expose the /metrics
 # endpoint w/o any authn/z, please comment the following line.
 - manager_auth_proxy_patch.yaml
-
-# Mount the controller config file for loading manager configurations
-# through a ComponentConfig type
-#- manager_config_patch.yaml
-
-# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
-# crd/kustomization.yaml
-#- manager_webhook_patch.yaml
-
-# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
-# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
-# 'CERTMANAGER' needs to be enabled to use ca injection
-#- webhookcainjection_patch.yaml
-
-# the following config is for teaching kustomize how to do var substitution
-vars:
-# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
-#- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
-#  objref:
-#    kind: Certificate
-#    group: cert-manager.io
-#    version: v1
-#    name: serving-cert # this name should match the one in certificate.yaml
-#  fieldref:
-#    fieldpath: metadata.namespace
-#- name: CERTIFICATE_NAME
-#  objref:
-#    kind: Certificate
-#    group: cert-manager.io
-#    version: v1
-#    name: serving-cert # this name should match the one in certificate.yaml
-#- name: SERVICE_NAMESPACE # namespace of the service
-#  objref:
-#    kind: Service
-#    version: v1
-#    name: webhook-service
-#  fieldref:
-#    fieldpath: metadata.namespace
-#- name: SERVICE_NAME
-#  objref:
-#    kind: Service
-#    version: v1
-#    name: webhook-service

config/manager/kustomization.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: k8s.gcr.io/nfd/node-feature-discovery-operator
-  newTag: v0.2.0
+  newTag: 0.4.0

config/manifests/bases/nfd-operator.clusterserviceversion.yaml

@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+# These resources constitute the fully configured set of manifests
+# used to generate the 'manifests/' directory in a bundle.
+resources:
+- bases/nfd-operator.clusterserviceversion.yaml
+- ../default
+- ../prometheus
+- ../samples
+- ../scorecard

config/manifests/kustomization.yaml

@@ -1,3 +1,4 @@
+
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -308,4 +309,4 @@ rules:
   resources:
   - storageclasses
   verbs:
-  - watch
+  - watch

config/rbac/role.yaml

@@ -1,5 +1,6 @@
 ## Append samples you want in your CSV to this file as resources ##
 resources:
 - nfd.kubernetes.io_v1_nodefeaturediscovery.yaml
+- nfd.kubernetes.io_v1alpha1_nodefeaturerules.yaml
 # +kubebuilder:scaffold:manifestskustomizesamples
 

config/samples/kustomization.yaml

@@ -0,0 +1,16 @@
+apiVersion: nfd.kubernetes.io/v1alpha1
+kind: NodeFeatureRule
+metadata:
+  name: my-sample-rule-object
+spec:
+  rules:
+    - name: "my sample rule"
+      labels:
+        "my-sample-feature": "true"
+      matchFeatures:
+        - feature: kernel.loadedmodule
+          matchExpressions:
+            dummy: {op: Exists}
+        - feature: kernel.config
+          matchExpressions:
+            X86: {op: In, value: ["y"]}