Merge pull request #112 from ksimon1/bump-kubevirt-vendor-version

Bump vendor dependencies

modules/copy-template/build/copy-template/Dockerfile

@@ -1,9 +1,12 @@
 FROM registry.access.redhat.com/ubi8/ubi-minimal AS builder
-RUN microdnf install -y golang-1.16.* && microdnf clean all
+RUN microdnf install -y wget tar gzip && microdnf clean all
 ENV TASK_NAME=copy-template \
     GOFLAGS="-mod=vendor" \
     GO111MODULE=on
 WORKDIR /src/${TASK_NAME}
+RUN wget https://go.dev/dl/go1.17.7.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.17.7.linux-amd64.tar.gz
+ENV PATH=$PATH:/usr/local/go/bin
+
 COPY . .
 RUN	CGO_ENABLED=0 GOOS=linux go build -o /${TASK_NAME} cmd/${TASK_NAME}/main.go
 

modules/copy-template/go.mod

@@ -1,70 +1,77 @@
 module github.com/kubevirt/kubevirt-tekton-tasks/modules/copy-template
 
-go 1.16
+go 1.17
 
 require (
-	github.com/alexflint/go-arg v1.4.2
-	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/alexflint/go-arg v1.4.3
 	github.com/kubevirt/kubevirt-tekton-tasks/modules/shared v0.0.0
-	github.com/onsi/ginkgo v1.15.1
-	github.com/onsi/gomega v1.11.0
-	github.com/openshift/api v0.0.0
-	github.com/openshift/client-go v0.0.0
-	go.uber.org/zap v1.16.0
-	k8s.io/apimachinery v0.20.2
+	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/gomega v1.18.1
+	github.com/openshift/api v3.9.0+incompatible
+	github.com/openshift/client-go v3.9.0+incompatible
+	go.uber.org/zap v1.21.0
+	k8s.io/apimachinery v0.23.4
 	k8s.io/client-go v12.0.0+incompatible
 )
 
+require (
+	github.com/alexflint/go-scalar v1.1.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-logr/logr v1.2.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/openshift/custom-resource-status v0.0.0-20200602122900-c002fd1547ca // indirect
+	github.com/pborman/uuid v1.2.0 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/api v0.23.4 // indirect
+	k8s.io/apiextensions-apiserver v0.23.4 // indirect
+	k8s.io/klog/v2 v2.30.0 // indirect
+	k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
+	kubevirt.io/api v0.50.0 // indirect
+	kubevirt.io/containerized-data-importer-api v1.44.0 // indirect
+	kubevirt.io/controller-lifecycle-operator-sdk v0.2.3 // indirect
+	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+)
+
 // locally referenced modules
 replace (
 	github.com/kubevirt/kubevirt-tekton-tasks/modules/shared v0.0.0 => ../shared
 	github.com/kubevirt/kubevirt-tekton-tasks/modules/sharedtest v0.0.0 => ../sharedtest
 )
 
-// Pinned to kubernetes-1.20.2 (due to kubevirt/client-go v0.39.0)
-replace (
-	k8s.io/api => k8s.io/api v0.20.2
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
-	k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
-	k8s.io/apiserver => k8s.io/apiserver v0.20.2
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
-	k8s.io/client-go => k8s.io/client-go v0.20.2
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
-	k8s.io/code-generator => k8s.io/code-generator v0.20.2
-	k8s.io/component-base => k8s.io/component-base v0.20.2
-	k8s.io/cri-api => k8s.io/cri-api v0.20.2
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2
-	k8s.io/kubectl => k8s.io/kubectl v0.20.2
-	k8s.io/kubelet => k8s.io/kubelet v0.20.2
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2
-	k8s.io/metrics => k8s.io/metrics v0.20.2
-	k8s.io/node-api => k8s.io/node-api v0.20.2
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.2
-	k8s.io/sample-controller => k8s.io/sample-controller v0.20.2
-)
-
 // Kubernetes
-replace k8s.io/klog => k8s.io/klog v0.4.0
-
-// KubeVirt
-replace github.com/go-kit/kit => github.com/go-kit/kit v0.3.0
-
-// Openshift
-// Pinned to openshift-master 20210309
 replace (
-	github.com/openshift/api => github.com/openshift/api v0.0.0-20210309190949-7d6cac66d2a4
-	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47
+	k8s.io/api => k8s.io/api v0.23.4
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.23.4
+	k8s.io/client-go => k8s.io/client-go v0.23.4
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.4
 )
 
-// CDI
-// Pinned to v1.31.0
+// Openshift
 replace (
-	github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190128024246-5eb7ae5bdb7a
-	kubevirt.io/containerized-data-importer => kubevirt.io/containerized-data-importer v1.31.0
+	github.com/openshift/api => github.com/openshift/api v0.0.0-20220325173635-8107b7a38e53
+	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20220316161609-20d926360175
 )