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 2, 2022
1 parent 8dc97bc commit d13cbb8
Show file tree
Hide file tree
Showing 1,574 changed files with 100,372 additions and 29,866 deletions.
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
283 changes: 260 additions & 23 deletions go.mod

Large diffs are not rendered by default.

191 changes: 142 additions & 49 deletions go.sum

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion hack/update-codegen.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
#!/bin/bash
#!/bin/bash -x

SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../../../k8s.io/code-generator)}

verify="${VERIFY:-}"

cd "${SCRIPT_ROOT}"

GOFLAGS="" bash ${CODEGEN_PKG}/generate-groups.sh "all" \
github.com/openshift/hive/pkg/client \
github.com/openshift/hive/apis \
"hive:v1 hiveinternal:v1alpha1" \
--go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt \
--trim-path-prefix github.com/openshift/hive
${verify}

# Generate deepcopy for platform-specific types.
Expand All @@ -18,6 +21,7 @@ GOFLAGS="" bash ${CODEGEN_PKG}/generate-groups.sh "deepcopy" \
github.com/openshift/hive/apis \
"hive:v1/agent hive:v1/aws hive:v1/azure hive:v1/baremetal hive:v1/gcp hive:v1/openstack hive:v1/ovirt hive:v1/vsphere hivecontracts:v1alpha1" \
--go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt \
--trim-path-prefix github.com/openshift/hive
${verify}

# deepcopy generators place the generated files in vendor directory, so move them back
Expand Down
37 changes: 28 additions & 9 deletions pkg/client/clientset/versioned/clientset.go

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

20 changes: 19 additions & 1 deletion pkg/client/clientset/versioned/typed/hive/v1/hive_client.go

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

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

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

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

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

2 changes: 1 addition & 1 deletion pkg/controller/utils/expectations_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

log "github.com/sirupsen/logrus"

"k8s.io/apimachinery/pkg/util/clock"
clock "k8s.io/utils/clock/testing"
"k8s.io/client-go/tools/cache"
)

Expand Down
5 changes: 5 additions & 0 deletions pkg/controller/utils/loggingeventhandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ type loggingQueue struct {
queue workqueue.RateLimitingInterface
}

// ShutDownWithDrain implements workqueue.Interface
func (q *loggingQueue) ShutDownWithDrain() {
q.queue.ShutDownWithDrain()
}

// Add implements workqueue.Interface
func (q *loggingQueue) Add(item interface{}) {
q.logger.Debugf("Adding %v", item)
Expand Down
1 change: 0 additions & 1 deletion pkg/operator/assets/bindata.go

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

0 comments on commit d13cbb8

Please sign in to comment.