Merge pull request #88 from ArangoGutierrez/upstream_backport

Bug 1883674: Replace operand image
openshift · Sep 30, 2020 · e4a39a0 · e4a39a0
2 parents 6bc1d35 + b24d0ec
commit e4a39a0
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Checkout the sources
 $ git clone https://github.com/openshift/cluster-nfd-operator $GOPATH/src/github.com/openshift/cluster-nfd-operator
 ```
 
-Update the `Makefile` and edit `IMAGE_TAG` and `IMAGE_REGISTRY` one will need those later to update the operator manifest (`image: $IMAGE_REGISTRY/$IMAGE_TAG`).
+Update the `Makefile` and edit `IMAGE`, `ORG` and `REGISTRY` one will need those later to update the operator manifest (`image: $(REGISTRY)/$(ORG)/$(cluster-nfd-operator:$(TAG))`).
 
 Update the Dockerfile with the correct golang build image and the base image the operator will run with. 
 

diff --git a/assets/node-feature-discovery/05-nfd-daemonset.yml b/assets/node-feature-discovery/05-nfd-daemonset.yml
@@ -22,7 +22,7 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-          image: quay.io/zvonkok/node-feature-discovery:v4.0
+          image: quay.io/openshift/origin-node-feature-discovery:4.6
           name: node-feature-discovery
           command: ["/usr/bin/node-feature-discovery"]
           args:

diff --git a/manifests/0600_operator.yaml b/manifests/0600_operator.yaml
@@ -44,7 +44,7 @@ spec:
             - name: OPERATOR_NAME
               value: "cluster-nfd-operator"
             - name: NODE_FEATURE_DISCOVERY_IMAGE
-              value: "quay.io/zvonkok/node-feature-discovery:v4.2"
+              value: "quay.io/openshift/origin-node-feature-discovery:4.6"
           securityContext:
             readOnlyRootFilesystem: true
             allowPrivilegeEscalation: false

diff --git a/manifests/0700_cr.yaml b/manifests/0700_cr.yaml
@@ -5,4 +5,4 @@ metadata:
   namespace: REPLACE_NAMESPACE
 spec:
   namespace: openshift-nfd
-  image: quay.io/zvonkok/node-feature-discovery:v4.2
+  image: quay.io/openshift/origin-node-feature-discovery:4.6
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	nodeFeatureDiscoveryImageDefault string = "quay.io/openshift-psap/node-feature-discovery:latest"
+	nodeFeatureDiscoveryImageDefault string = "quay.io/openshift/origin-node-feature-discovery:4.6"
 	operatorNameDefault              string = "node-feature-discovery"
 	operatorNamespaceDefault         string = "openshift-nfd-operator"
 	resyncPeriodDefault              int64  = 600

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -58,7 +58,7 @@ var (
 	cleanupTimeout       = time.Second * 30
 	opName               = "nfd-master-client"
 	opNamespace          = "openshift-nfd"
-	opImage              = "quay.io/zvonkok/node-feature-discovery:v4.2"
+	opImage              = "quay.io/openshift/origin-node-feature-discovery:4.6"
 	//opImage = "registry.svc.ci.openshift.org/openshift/node-feature-discovery-container:v4.2"
 )