Merge pull request redhat-cne#60 from jzding/images

update images

Author: jzding

Dockerfile.dev

@@ -1,5 +1,6 @@
-# Used by quay.io ci builds or developer tests
-FROM quay.io/jacding/openshift-origin-release:golang-1.16 AS go-builder
+# Used by quay.io to trigger developer builds
+FROM quay.io/redhat-cne/openshift-origin-release:golang-1.17 AS go-builder
+
 ENV GO111MODULE=off
 ENV CGO_ENABLED=1
 ENV COMMON_GO_ARGS=-race

Dockerfile.local

@@ -1,5 +1,5 @@
 # Build hw-event-proxy binaries
-FROM quay.io/jacding/openshift-origin-release:golang-1.16 AS go-builder
+FROM quay.io/redhat-cne/openshift-origin-release:golang-1.17 AS go-builder
 
 WORKDIR /go/src/github.com/redhat-cne/hw-event-proxy
 COPY ./hw-event-proxy ./hw-event-proxy

Makefile

@@ -4,8 +4,8 @@
 VERSION ?=latest
 
 # Image name
-PROXY_IMG_NAME ?= quay.io/redhat-cne/hw-event-proxy
-SIDECAR_IMG_NAME ?= quay.io/redhat-cne/cloud-event-proxy
+PROXY_IMG_NAME ?= quay.io/openshift/origin-baremetal-hardware-event-proxy
+SIDECAR_IMG_NAME ?= quay.io/openshift/origin-cloud-event-proxy
 CONSUMER_IMG_NAME ?= quay.io/redhat-cne/cloud-native-event-consumer
 
 PROXY_IMG ?= ${PROXY_IMG_NAME}:${VERSION}

docs/development.md

@@ -72,9 +72,9 @@ podman push localhost/hw-event-proxy:${TAG} quay.io/jacding/hw-event-proxy:lates
 ### Set Env Variables
 ```shell
 export VERSION=latest
-export PROXY_IMG=quay.io/jacding/hw-event-proxy:${VERSION}
-export SIDECAR_IMG=quay.io/jacding/cloud-event-proxy:${VERSION}
-export CONSUMER_IMG=quay.io/jacding/cloud-native-event-consumer:${VERSION}
+export PROXY_IMG=quay.io/openshift/origin-baremetal-hardware-event-proxy:${VERSION}
+export SIDECAR_IMG=quay.io/openshift/origin-cloud-event-proxy:${VERSION}
+export CONSUMER_IMG=quay.io/redhat-cne/cloud-native-event-consumer:${VERSION}
 # replace the following with real Redfish credentials and BMC ip address
 export REDFISH_USERNAME=admin; export REDFISH_PASSWORD=admin; export REDFISH_HOSTADDR=127.0.0.1
 ```

e2e-tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/jacding/openshift-origin-release:golang-1.16
+FROM quay.io/redhat-cne/openshift-origin-release:golang-1.17
 
 WORKDIR /
 COPY . .

e2e-tests/manifests/redfish-event-test.yaml

@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: redfish-event-test
-          image: quay.io/jacding/hw-event-proxy-e2e-test:latest
+          image: quay.io/redhat-cne/hw-event-proxy-e2e-test:latest
           env:
             - name: MSG_PER_SEC
               value: "1"

manifests/base/consumer.yaml

@@ -42,7 +42,7 @@ spec:
             - name: LOG_LEVEL
               value: "debug"
         - name: cloud-native-event-sidecar
-          image: quay.io/redhat-cne/cloud-event-proxy
+          image: quay.io/openshift/origin-cloud-event-proxy
           args:
             - "--metrics-addr=127.0.0.1:9091"
             - "--store-path=/store"

manifests/base/hw-event-proxy.yaml

@@ -29,7 +29,7 @@ spec:
       serviceAccountName: hw-event-proxy-sa
       containers:
         - name: hw-event-proxy
-          image: quay.io/redhat-cne/hw-event-proxy
+          image: quay.io/openshift/origin-baremetal-hardware-event-proxy
           args:
             - "--api-port=8089"
           ports:
@@ -69,7 +69,7 @@ spec:
             - name: LOG_LEVEL
               value: "trace"
         - name: cloud-native-event-sidecar
-          image: quay.io/redhat-cne/cloud-event-proxy
+          image: quay.io/openshift/origin-cloud-event-proxy
           args:
             - "--metrics-addr=127.0.0.1:9091"
             - "--store-path=/store"