Move 4.10 to use stable channel

Signed-off-by: Carlos Eduardo Arango Gutierrez <carangog@redhat.com>
openshift · Oct 5, 2021 · b1b0146 · b1b0146
1 parent c21503a
commit b1b0146
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 32 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ RUN make build
 
 # Create production image for running the operator
 FROM registry.ci.openshift.org/ocp/4.9:base
-ARG CSV=4.9
+ARG CSV=4.10
 COPY --from=builder /go/src/github.com/openshift/cluster-nfd-operator/node-feature-discovery-operator /
 
 RUN mkdir -p /opt/nfd

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ VERSION := $(shell git describe --tags --dirty --always)
 # To re-generate a bundle for other specific channels without changing the standard setup, you can:
 # - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=preview,fast,stable)
 # - use environment variables to overwrite this value (e.g export CHANNELS="preview,fast,stable")
-CHANNELS="4.9"
+CHANNELS="stable"
 ifneq ($(origin CHANNELS), undefined)
 BUNDLE_CHANNELS := --channels=$(CHANNELS)
 endif
@@ -20,7 +20,7 @@ endif
 # To re-generate a bundle for any other default channel without changing the default setup, you can:
 # - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable)
 # - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable")
-DEFAULT_CHANNEL="4.9"
+DEFAULT_CHANNEL="stable"
 ifneq ($(origin DEFAULT_CHANNEL), undefined)
 BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
 endif

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/openshift/origin-cluster-nfd-operator
-  newTag: 4.9.0
+  newTag: 4.10.0
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -53,7 +53,7 @@ spec:
             - name: OPERATOR_NAME
               value: "cluster-nfd-operator"
             - name: NODE_FEATURE_DISCOVERY_IMAGE
-              value: "quay.io/openshift/origin-node-feature-discovery:4.9"
+              value: "quay.io/openshift/origin-node-feature-discovery:4.10"
           ports:
             - name: metrics
               containerPort: 8080

diff --git a/config/manifests/bases/node-feature-discovery-operator.clusterserviceversion.yaml b/config/manifests/bases/node-feature-discovery-operator.clusterserviceversion.yaml
@@ -17,7 +17,7 @@ metadata:
             },
             "instance": "",
             "operand": {
-              "image": "quay.io/openshift/origin-node-feature-discovery:4.9",
+              "image": "quay.io/openshift/origin-node-feature-discovery:4.10",
               "imagePullPolicy": "Always",
               "namespace": "openshift-nfd"
             },
@@ -29,9 +29,9 @@ metadata:
       ]
     capabilities: Deep Insights
     categories: Integration & Delivery,OpenShift Optional
-    containerImage: quay.io/openshift/origin-cluster-nfd-operator:4.9
+    containerImage: quay.io/openshift/origin-cluster-nfd-operator:4.10
     description: "The NFD operator creates and maintains the Node Feature Discovery (NFD) on Kubernetes. It detects hardware features available on each  node in a Kubernetes cluster, and advertises those features using node labels.\n\nNFD consists of two software components:\n    \n## NFD-Master\n\nNFD-Master is the daemon responsible for communication towards the Kubernetes\nAPI. That is, it receives labeling requests from the worker and modifies node\nobjects accordingly.\n\n## NFD-Worker\n\nNFD-Worker is a daemon responsible for feature detection. It then communicates\nthe information to nfd-master which does the actual node labeling.  One\ninstance of nfd-worker is supposed to be running on each node of the cluster,\n\n### Feature discovery\n\nFeature discovery is divided into domain-specific feature sources:\n\n- CPU\n- IOMMU\n- Kernel\n- Memory\n- Network\n- PCI\n- Storage\n- System\n- USB\n- Custom (rule-based custom features)\n- Local (hooks for user-specific features)\n\nEach feature source is responsible for detecting a set of features which. in\nturn, are turned into node feature labels.  Feature labels are prefixed with\n`feature.node.kubernetes.io/` and also contain the name of the feature source.\nNon-standard user-specific feature labels can be created with the local and\ncustom feature sources.\n"
-    olm.skipRange: '>=4.6.0 <4.9.0'
+    olm.skipRange: '>=4.6.0 <4.10.0'
     operators.operatorframework.io/builder: operator-sdk-v1.4.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     provider: Red Hat
@@ -42,7 +42,7 @@ metadata:
     operatorframework.io/arch.arm64: supported
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
-  name: node-feature-discovery-operator.v4.9.0
+  name: node-feature-discovery-operator.v4.10.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -470,8 +470,8 @@ spec:
                 - name: OPERATOR_NAME
                   value: cluster-nfd-operator
                 - name: NODE_FEATURE_DISCOVERY_IMAGE
-                  value: quay.io/openshift/origin-node-feature-discovery:4.9
-                image: quay.io/openshift/origin-cluster-nfd-operator:4.9
+                  value: quay.io/openshift/origin-node-feature-discovery:4.10
+                image: quay.io/openshift/origin-cluster-nfd-operator:4.10
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -520,4 +520,4 @@ spec:
   provider:
     name: Red Hat
     url: https://github.com/openshift/cluster-nfd-operator
-  version: 4.9.0
+  version: 4.10.0
diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml
@@ -25,7 +25,7 @@ patches:
         repository: https://github.com/openshift/cluster-nfd-operator
         support: Red Hat
         categories: Integration & Delivery,OpenShift Optional
-        containerImage: quay.io/openshift/origin-cluster-nfd-operator:4.9
+        containerImage: quay.io/openshift/origin-cluster-nfd-operator:4.10
         description: "The NFD operator creates and maintains the Node Feature Discovery (NFD) on Kubernetes. It detects hardware features available on each  node in a Kubernetes cluster, and advertises those features using node labels.\n\nNFD consists of two software components:\n    \n## NFD-Master\n\nNFD-Master is the daemon responsible for communication towards the Kubernetes\nAPI. That is, it receives labeling requests from the worker and modifies node\nobjects accordingly.\n\n## NFD-Worker\n\nNFD-Worker is a daemon responsible for feature detection. It then communicates\nthe information to nfd-master which does the actual node labeling.  One\ninstance of nfd-worker is supposed to be running on each node of the cluster,\n\n### Feature discovery\n\nFeature discovery is divided into domain-specific feature sources:\n\n- CPU\n- IOMMU\n- Kernel\n- Memory\n- Network\n- PCI\n- Storage\n- System\n- USB\n- Custom (rule-based custom features)\n- Local (hooks for user-specific features)\n\nEach feature source is responsible for detecting a set of features which. in\nturn, are turned into node feature labels.  Feature labels are prefixed with\n`feature.node.kubernetes.io/` and also contain the name of the feature source.\nNon-standard user-specific feature labels can be created with the local and\ncustom feature sources.\n"
     - op: add
       path: /metadata/spec

diff --git a/manifests/4.9/bundle.Dockerfile b/manifests/4.9/bundle.Dockerfile
@@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=node-feature-discovery-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=4.9
-LABEL operators.operatorframework.io.bundle.channel.default.v1=4.9
+LABEL operators.operatorframework.io.bundle.channels.v1=stable
+LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.4.0+git

diff --git a/manifests/4.9/manifests/node-feature-discovery-operator.clusterserviceversion.yaml b/manifests/4.9/manifests/node-feature-discovery-operator.clusterserviceversion.yaml
@@ -16,7 +16,7 @@ metadata:
               "configData": "#    - name: \"more.kernel.features\"\n#      matchOn:\n#      - loadedKMod: [\"example_kmod3\"]\n#    - name: \"more.features.by.nodename\"\n#      value: customValue\n#      matchOn:\n#      - nodename: [\"special-.*-node-.*\"]\n"
             },
             "operand": {
-              "image": "quay.io/openshift/origin-node-feature-discovery:4.9",
+              "image": "quay.io/openshift/origin-node-feature-discovery:4.10",
               "imagePullPolicy": "Always",
               "namespace": "openshift-nfd",
               "servicePort": 12000
@@ -29,7 +29,7 @@ metadata:
       ]
     capabilities: Deep Insights
     categories: Integration & Delivery,OpenShift Optional
-    containerImage: quay.io/openshift/origin-cluster-nfd-operator:4.9
+    containerImage: quay.io/openshift/origin-cluster-nfd-operator:4.10
     description: "The NFD operator creates and maintains the Node Feature Discovery (NFD) on Kubernetes. It detects hardware features available on each  node in a Kubernetes cluster, and advertises those features using node labels.\n\nNFD consists of two software components:\n    \n## NFD-Master\n\nNFD-Master is the daemon responsible for communication towards the Kubernetes\nAPI. That is, it receives labeling requests from the worker and modifies node\nobjects accordingly.\n\n## NFD-Worker\n\nNFD-Worker is a daemon responsible for feature detection. It then communicates\nthe information to nfd-master which does the actual node labeling.  One\ninstance of nfd-worker is supposed to be running on each node of the cluster,\n\n### Feature discovery\n\nFeature discovery is divided into domain-specific feature sources:\n\n- CPU\n- IOMMU\n- Kernel\n- Memory\n- Network\n- PCI\n- Storage\n- System\n- USB\n- Custom (rule-based custom features)\n- Local (hooks for user-specific features)\n\nEach feature source is responsible for detecting a set of features which. in\nturn, are turned into node feature labels.  Feature labels are prefixed with\n`feature.node.kubernetes.io/` and also contain the name of the feature source.\nNon-standard user-specific feature labels can be created with the local and\ncustom feature sources.\n"
     operatorframework.io/cluster-monitoring: "true"
     operatorframework.io/suggested-namespace: openshift-nfd
@@ -38,14 +38,14 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     provider: Red Hat
     repository: https://github.com/openshift/cluster-nfd-operator
-    olm.skipRange: ">=4.6.0 <4.9.0"
+    olm.skipRange: ">=4.7.0 <4.10.0"
     support: Red Hat
   labels:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.arm64: supported
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
-  name: nfd.v4.9.0
+  name: nfd.v4.10.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -508,8 +508,8 @@ spec:
                 - name: OPERATOR_NAME
                   value: cluster-nfd-operator
                 - name: NODE_FEATURE_DISCOVERY_IMAGE
-                  value: quay.io/openshift/origin-node-feature-discovery:4.9
-                image: quay.io/openshift/origin-cluster-nfd-operator:4.9
+                  value: quay.io/openshift/origin-node-feature-discovery:4.10
+                image: quay.io/openshift/origin-cluster-nfd-operator:4.10
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -642,4 +642,4 @@ spec:
   provider:
     name: Red Hat
     url: https://github.com/openshift/cluster-nfd-operator
-  version: 4.9.0
+  version: 4.10.0
diff --git a/manifests/4.9/metadata/annotations.yaml b/manifests/4.9/metadata/annotations.yaml
@@ -4,11 +4,11 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: node-feature-discovery-operator
-  operators.operatorframework.io.bundle.channels.v1: 4.9
-  operators.operatorframework.io.bundle.channel.default.v1: 4.9
-  operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
+  operators.operatorframework.io.bundle.channels.v1: stable
+  operators.operatorframework.io.bundle.channel.default.v1: stable
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.4.0+git
+  operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
 
   # Annotations for testing.
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1

diff --git a/manifests/image-references b/manifests/image-references
@@ -5,11 +5,11 @@ spec:
   - name: node-feature-discovery
     from:
       kind: DockerImage
-      name: quay.io/openshift/origin-node-feature-discovery:4.9
+      name: quay.io/openshift/origin-node-feature-discovery:4.10
   - name: cluster-nfd-operator
     from:
       kind: DockerImage
-      name: quay.io/openshift/origin-cluster-nfd-operator:4.9
+      name: quay.io/openshift/origin-cluster-nfd-operator:4.10
   - name: kube-rbac-proxy
     from:
       kind: DockerImage

diff --git a/manifests/nfd.package.yaml b/manifests/nfd.package.yaml
@@ -1,5 +1,5 @@
 packageName: nfd
 channels:
-- name: '4.9'
-  currentCSV: nfd.v4.9.0
-defaultChannel: "4.9"
+- name: stable
+  currentCSV: nfd.v4.10.0
+defaultChannel: stable
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -22,7 +22,7 @@ import (
 )
 
 const (
-	nodeFeatureDiscoveryImageDefault string = "quay.io/openshift/origin-node-feature-discovery:4.9"
+	nodeFeatureDiscoveryImageDefault string = "quay.io/openshift/origin-node-feature-discovery:4.10"
 	contextTimeout                          = 300 * time.Second
 	// A number in seconds to define a context Timeout
 	// E.g. if 5 seconds is wanted, the CTX_TIMEOUT=5

diff --git a/version/version.go b/version/version.go
@@ -16,5 +16,5 @@ limitations under the License.
 package version
 
 var (
-	Version = "4.9.0"
+	Version = "4.10.0"
 )