Skip to content

Commit

Permalink
require go 1.18 for TryLock
Browse files Browse the repository at this point in the history
  • Loading branch information
stlaz committed Apr 25, 2022
1 parent cbc8a69 commit eef8d30
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 313 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.17-openshift-4.10
tag: rhel-8-release-golang-1.18-openshift-4.11
4 changes: 2 additions & 2 deletions Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder
WORKDIR /go/src/github.com/openshift/cluster-policy-controller
COPY . .
RUN make build --warn-undefined-variables

FROM registry.ci.openshift.org/ocp/4.10:base
FROM registry.ci.openshift.org/ocp/4.11:base
COPY --from=builder /go/src/github.com/openshift/cluster-policy-controller/cluster-policy-controller /usr/bin/
LABEL io.k8s.display-name="OpenShift Cluster Policy Controller Command" \
io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openshift/cluster-policy-controller

go 1.17
go 1.18

require (
github.com/davecgh/go-spew v1.1.1
Expand Down
44 changes: 0 additions & 44 deletions go.sum

Large diffs are not rendered by default.

30 changes: 0 additions & 30 deletions vendor/k8s.io/client-go/discovery/cached/legacy.go

This file was deleted.

233 changes: 0 additions & 233 deletions vendor/k8s.io/client-go/discovery/cached/memory/memcache.go

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -889,8 +889,6 @@ k8s.io/client-go/applyconfigurations/storage/v1
k8s.io/client-go/applyconfigurations/storage/v1alpha1
k8s.io/client-go/applyconfigurations/storage/v1beta1
k8s.io/client-go/discovery
k8s.io/client-go/discovery/cached
k8s.io/client-go/discovery/cached/memory
k8s.io/client-go/discovery/fake
k8s.io/client-go/informers
k8s.io/client-go/informers/admissionregistration
Expand Down

0 comments on commit eef8d30

Please sign in to comment.