From 1d1cd0607c7cd860f90883a7effeca7a72ca9117 Mon Sep 17 00:00:00 2001
From: asararatnakar <asara.ratnakar@gmail.com>
Date: Mon, 25 Sep 2023 12:51:20 -0400
Subject: [PATCH] Revert the golang version to 1.18

Signed-off-by: asararatnakar <asara.ratnakar@gmail.com>
---
 .github/workflows/integration-tests.yaml | 2 +-
 .github/workflows/release.yaml           | 2 +-
 .github/workflows/unit-tests.yaml        | 2 +-
 Dockerfile                               | 2 +-
 Makefile                                 | 2 +-
 go.mod                                   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
index a139e1b7..8435f52b 100644
--- a/.github/workflows/integration-tests.yaml
+++ b/.github/workflows/integration-tests.yaml
@@ -27,7 +27,7 @@ env:
   KUBECONFIG_PATH: /tmp/kubeconfig.yaml
   OPERATOR_NAMESPACE: inttest
   DOCKERCONFIGJSON: ${{ secrets.DOCKERCONFIGJSON }}
-  GO_VER: 1.20
+  GO_VER: 1.18
 
 jobs:
   suite:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index def4b773..e8064f06 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -7,7 +7,7 @@ on:
     tags: [v1.*]
 
 env:
-  GO_VER: 1.20.6
+  GO_VER: 1.18
   GO_TAGS: ""
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
index e5289be0..1f9c82e6 100644
--- a/.github/workflows/unit-tests.yaml
+++ b/.github/workflows/unit-tests.yaml
@@ -25,7 +25,7 @@ on:
     branches: [v1.*]
 
 env:
-  GO_VER: 1.20
+  GO_VER: 1.18
 
 jobs:
   make-checks:
diff --git a/Dockerfile b/Dockerfile
index 4af4582e..f7e39838 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG GO_VER
 FROM registry.access.redhat.com/ubi8/go-toolset:$GO_VER as builder
 COPY . /go/src/github.com/IBM-Blockchain/fabric-operator
 WORKDIR /go/src/github.com/IBM-Blockchain/fabric-operator
-RUN GOOS=linux GOARCH=$(go env GOARCH) CGO_ENABLED=1 go build -mod=vendor -tags "pkcs11" -gcflags all=-trimpath=${GOPATH} -asmflags all=-trimpath=${GOPATH} -o /tmp/build/_output/bin/ibp-operator
+RUN GOOS=linux GOARCH=${ARCH} CGO_ENABLED=1 go build -mod=vendor -tags "pkcs11" -gcflags all=-trimpath=${GOPATH} -asmflags all=-trimpath=${GOPATH} -o /tmp/build/_output/bin/ibp-operator
 
 ########## Final Image ##########
 FROM registry.access.redhat.com/ubi8/ubi-minimal
diff --git a/Makefile b/Makefile
index b33f7751..0b045e3d 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
 IMAGE ?= ghcr.io/hyperledger-labs/fabric-operator
 TAG ?= $(shell git rev-parse --short HEAD)
 ARCH ?= $(shell go env GOARCH)
-OSS_GO_VER ?= 1.20.6
+OSS_GO_VER ?= 1.18
 BUILD_DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 OS = $(shell go env GOOS)
 
diff --git a/go.mod b/go.mod
index 4c2dbcd4..f5b08806 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/IBM-Blockchain/fabric-operator
 
-go 1.20
+go 1.18
 
 require (
 	github.com/cloudflare/cfssl v1.4.1