Skip to content

Commit

Permalink
Updates for codegen, go 1.17, etc.
Browse files Browse the repository at this point in the history
kubernetes/kubernetes#106964 fixed a bug whereby codegen outside of
GOPATH would put generated files under github.com/ relative to the repo
root. Revendor k8s.io/code-generator to pull in the fix and update our
script to use the --trim-path-prefix flag it introduced.

The update resulted in dependency hell, including needing to move to go
1.17.

Changes in actual hive code to accommodate updated dependencies include:
- Accommodate a new method on workqueue.Interface.
- Remove the `--v` flag from the hiveadmission executable --
logging-related CLI options were removed from the underlying command at
some point.
- Rewrite the logr wrapper we pass to controller-runtime to initialize
the managers for the operator and controllers
- Repoint where we get our fake clock from for testing expectations.

HIVE-1723
HIVE-1753
  • Loading branch information
2uasimojo committed Feb 4, 2022
1 parent 787ae35 commit 38c9fff
Show file tree
Hide file tree
Showing 1,596 changed files with 100,415 additions and 29,916 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/openshift/release:golang-1.16 as builder
FROM registry.ci.openshift.org/openshift/release:golang-1.17 as builder
RUN mkdir -p /go/src/github.com/openshift/hive
WORKDIR /go/src/github.com/openshift/hive
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ubi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/openshift/release:golang-1.16 as builder
FROM registry.ci.openshift.org/openshift/release:golang-1.17 as builder
RUN mkdir -p /go/src/github.com/openshift/hive
WORKDIR /go/src/github.com/openshift/hive
COPY . .
Expand Down
18 changes: 16 additions & 2 deletions apis/go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
module github.com/openshift/hive/apis

go 1.16
go 1.17

require (
github.com/openshift/api v0.0.0-20210216211028-bb81baaf35cd
gopkg.in/yaml.v2 v2.3.0 // indirect
k8s.io/api v0.20.0
k8s.io/apimachinery v0.20.0
)

require (
github.com/go-logr/logr v0.2.0 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
golang.org/x/text v0.3.4 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
k8s.io/klog/v2 v2.4.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
)
1 change: 1 addition & 0 deletions apis/hive/v1/agent/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/hive/v1/aws/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/hive/v1/azure/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/hive/v1/baremetal/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/hive/v1/gcp/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/hive/v1/openstack/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/hive/v1/ovirt/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/hive/v1/vsphere/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/hive/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/hivecontracts/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apis/hiveinternal/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions apis/vendor/github.com/go-logr/logr/go.mod

This file was deleted.

3 changes: 0 additions & 3 deletions apis/vendor/github.com/google/gofuzz/go.mod

This file was deleted.

11 changes: 0 additions & 11 deletions apis/vendor/github.com/json-iterator/go/go.mod

This file was deleted.

14 changes: 0 additions & 14 deletions apis/vendor/github.com/json-iterator/go/go.sum

This file was deleted.

5 changes: 0 additions & 5 deletions apis/vendor/gopkg.in/yaml.v2/go.mod

This file was deleted.

5 changes: 0 additions & 5 deletions apis/vendor/k8s.io/klog/v2/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions apis/vendor/k8s.io/klog/v2/go.sum

This file was deleted.

17 changes: 14 additions & 3 deletions apis/vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -1,40 +1,49 @@
# github.com/go-logr/logr v0.2.0
## explicit; go 1.14
github.com/go-logr/logr
# github.com/gogo/protobuf v1.3.1
## explicit
github.com/gogo/protobuf/proto
github.com/gogo/protobuf/sortkeys
# github.com/google/gofuzz v1.1.0
## explicit; go 1.12
github.com/google/gofuzz
# github.com/json-iterator/go v1.1.10
## explicit; go 1.12
github.com/json-iterator/go
# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
## explicit
github.com/modern-go/concurrent
# github.com/modern-go/reflect2 v1.0.1
## explicit
github.com/modern-go/reflect2
# github.com/openshift/api v0.0.0-20210216211028-bb81baaf35cd
## explicit
## explicit; go 1.15
github.com/openshift/api/config/v1
# golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
## explicit; go 1.11
golang.org/x/net/http/httpguts
golang.org/x/net/http2
golang.org/x/net/http2/hpack
golang.org/x/net/idna
# golang.org/x/text v0.3.4
## explicit; go 1.11
golang.org/x/text/secure/bidirule
golang.org/x/text/transform
golang.org/x/text/unicode/bidi
golang.org/x/text/unicode/norm
# gopkg.in/inf.v0 v0.9.1
## explicit
gopkg.in/inf.v0
# gopkg.in/yaml.v2 v2.3.0
## explicit
gopkg.in/yaml.v2
# k8s.io/api v0.20.0
## explicit
## explicit; go 1.15
k8s.io/api/core/v1
k8s.io/api/rbac/v1
# k8s.io/apimachinery v0.20.0
## explicit
## explicit; go 1.15
k8s.io/apimachinery/pkg/api/resource
k8s.io/apimachinery/pkg/apis/meta/v1
k8s.io/apimachinery/pkg/conversion
Expand All @@ -57,6 +66,8 @@ k8s.io/apimachinery/pkg/util/validation/field
k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/klog/v2 v2.4.0
## explicit; go 1.13
k8s.io/klog/v2
# sigs.k8s.io/structured-merge-diff/v4 v4.0.2
## explicit; go 1.13
sigs.k8s.io/structured-merge-diff/v4/value
1 change: 0 additions & 1 deletion config/hiveadmission/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ spec:
- "--audit-log-path=-"
- "--tls-cert-file=/var/serving-cert/tls.crt"
- "--tls-private-key-file=/var/serving-cert/tls.key"
- "--v=2"
ports:
- containerPort: 9443
protocol: TCP
Expand Down

0 comments on commit 38c9fff

Please sign in to comment.