upgrade to rhel-9 and use 4.15 consumer/sidecar

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.19-openshift-4.14
+  tag: rhel-9-release-golang-1.20-openshift-4.15

Dockerfile

@@ -1,6 +1,6 @@
 # Changes to this file are not auto-propagated to the downstream build automation. We need to make the changes manually in the midstream repo located here:
 # https://gitlab.cee.redhat.com/cpaas-midstream/telco-5g-ran/baremetal-hardware-event-proxy/-/blob/rhaos-4.13-rhel-8/distgit/containers/baremetal-hardware-event-proxy/Dockerfile.in
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS go-builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS go-builder
 ENV GO111MODULE=off
 ENV CGO_ENABLED=1
 ENV COMMON_GO_ARGS=-race

Dockerfile.dev

@@ -1,5 +1,5 @@
 # Used by quay.io to trigger developer builds
-FROM quay.io/redhat-cne/openshift-origin-release:rhel-8-golang-1.20-openshift-4.15 AS go-builder
+FROM quay.io/redhat-cne/openshift-origin-release:rhel-9-golang-1.20-openshift-4.15 AS go-builder
 
 ENV GO111MODULE=off
 ENV CGO_ENABLED=1
@@ -25,4 +25,4 @@ LABEL io.k8s.display-name="Bare Metal Event Relay" \
       io.openshift.tags="openshift" \
       maintainer="Jack Ding <[email protected]>"
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

Dockerfile.local

@@ -1,5 +1,5 @@
 # Build hw-event-proxy binaries
-FROM quay.io/redhat-cne/openshift-origin-release:rhel-8-golang-1.20-openshift-4.15 AS go-builder
+FROM quay.io/redhat-cne/openshift-origin-release:rhel-9-golang-1.20-openshift-4.15 AS go-builder
 
 WORKDIR /go/src/github.com/redhat-cne/hw-event-proxy
 COPY ./hw-event-proxy ./hw-event-proxy
@@ -23,4 +23,4 @@ LABEL io.k8s.display-name="Bare Metal Event Relay" \
       io.openshift.tags="openshift" \
       maintainer="Jack Ding <[email protected]>"
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

Makefile

@@ -4,8 +4,8 @@
 VERSION ?=latest
 
 PROXY_IMG ?= quay.io/redhat-cne/hw-event-proxy:$(VERSION)
-SIDECAR_IMG ?= quay.io/redhat-cne/cloud-event-proxy:release-4.14
-CONSUMER_IMG ?= quay.io/redhat-cne/cloud-event-consumer:release-4.14
+SIDECAR_IMG ?= quay.io/redhat-cne/cloud-event-proxy:release-4.15
+CONSUMER_IMG ?= quay.io/redhat-cne/cloud-event-consumer:release-4.15
 
 # For performance test with HTTP transport
 NUM_CONSUMER ?=20

e2e-tests/Dockerfile

@@ -1,7 +1,7 @@
-FROM quay.io/redhat-cne/openshift-origin-release:rhel-8-golang-1.20-openshift-4.15
+FROM quay.io/redhat-cne/openshift-origin-release:rhel-9-golang-1.20-openshift-4.15
 
 WORKDIR /
 COPY . .
 RUN go build -o redfish-event-test ./cmd/main.go
 
-ENTRYPOINT ["./scripts/entrypoint.sh"]
+ENTRYPOINT ["./scripts/entrypoint.sh"]

manifests/consumer/deployment.yaml

@@ -25,11 +25,16 @@ spec:
             - "--local-api-addr=localhost:9089"
             - "--api-path=/api/ocloudNotifications/v1/"
             - "--api-addr=localhost:8089"
+            - "--http-event-publishers=hw-event-publisher-service.$(TRANSPORT_NAMESPACE).svc.cluster.local:$(TRANSPORT_PORT)"
           env:
             - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            - name: TRANSPORT_NAMESPACE
+              value: "openshift-bare-metal-events"
+            - name: TRANSPORT_PORT
+              value: "9043"
             - name: CONSUMER_TYPE
               value: "HW"
             - name: LOG_LEVEL

manifests/consumer/kustomization.yaml

@@ -9,7 +9,7 @@ resources:
 images:
 - name: cloud-event-consumer
   newName: quay.io/redhat-cne/cloud-event-consumer
-  newTag: release-4.14
+  newTag: release-4.15
 - name: cloud-event-sidecar
   newName: quay.io/redhat-cne/cloud-event-proxy
-  newTag: release-4.14
+  newTag: release-4.15

manifests/proxy/kustomization.yaml

@@ -10,9 +10,9 @@ resources:
 replicas:
 - count: 1
   name: hw-event-proxy
+  # replace these with real info from your baremetal device
 secretGenerator:
 - literals:
-  # replace these with real info from your baremetal device
   - username=root
   - password=calvin
   - hostaddr=192.0.2.1
@@ -21,7 +21,7 @@ secretGenerator:
 images:
 - name: cloud-event-sidecar
   newName: quay.io/redhat-cne/cloud-event-proxy
-  newTag: release-4.14
+  newTag: release-4.15
 - name: hw-event-proxy
   newName: quay.io/redhat-cne/hw-event-proxy
   newTag: latest