Skip to content

Commit 067f77c

Browse files
authored
cluster: Allow kubevirtci tag overriding (#319)
* cluster: Allow kubevirtci tag overriding It is helpful either manually or for example when used from CNAO, to use same tag of the cluster that CNAO deployed. Otherwise a kubevirtci tag mismatch can cause failures once running from CNAO. Signed-off-by: Or Shoval <[email protected]> * dockerfile: Fix go downloading Previous method doesnt support newer versions anymore (or not at least atm). Just use wget instead. Signed-off-by: Or Shoval <[email protected]> --------- Signed-off-by: Or Shoval <[email protected]>
1 parent 86f45a9 commit 067f77c

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

cluster/cluster.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.26-centos9'}
16-
export KUBEVIRTCI_TAG=2305081329-48e913c
16+
export KUBEVIRTCI_TAG=${KUBEVIRTCI_TAG:-2305081329-48e913c}
1717

1818
KUBEVIRTCI_REPO='https://github.com/kubevirt/kubevirtci.git'
1919
# The CLUSTER_PATH var is used in cluster folder and points to the _kubevirtci where the cluster is deployed from.

cmd/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ RUN mkdir /workdir
44
WORKDIR /workdir
55

66
COPY go.mod .
7-
RUN dnf install -y golang-$(sed -En 's/^go +(.*+)$/\1/p' go.mod).*
7+
8+
RUN dnf install -y wget
9+
10+
RUN GO_VERSION=$(sed -En 's/^go +(.*)$/\1/p' go.mod) && \
11+
wget https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
12+
tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz && \
13+
rm go${GO_VERSION}.linux-amd64.tar.gz
14+
15+
ENV PATH /usr/local/go/bin:$PATH
816

917
COPY . .
1018

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ replace (
8787
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.1
8888
)
8989

90-
go 1.21
90+
go 1.21.0

0 commit comments

Comments
 (0)