Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump libraries - k8s to 1.16 and istio to 1.4 #446

Merged
merged 6 commits into from
May 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
240 changes: 156 additions & 84 deletions Gopkg.lock

Large diffs are not rendered by default.

89 changes: 52 additions & 37 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,62 +17,45 @@ required = [
name = "k8s.io/code-generator"
non-go = false

[[override]]
[[prune.project]]
name = "k8s.io/gengo"

# Constraints
[[constraint]]
name = "k8s.io/code-generator"
# revision for tag "kubernetes-1.14.6"
revision = "50b561225d70b3eb79a1faafd3dfe7b1a62cbe73"
version = "kubernetes-1.16.0"

[[override]]
[[constraint]]
name = "k8s.io/api"
# revision for tag "kubernetes-1.14.6"
revision = "e3a6b8045b0b303430f6d0c261fd9e35be50800e"
version = "kubernetes-1.16.0"

[[override]]
[[constraint]]
name = "k8s.io/apiextensions-apiserver"
# revision for tag "kubernetes-1.14.6"
revision = "e49a3471dba57c6a6b7437fae6897655eb3d6982"
version = "kubernetes-1.16.0"

[[override]]
[[constraint]]
name = "k8s.io/apimachinery"
# revision for tag "kubernetes-1.14.6"
revision = "a9f1d8a9c10182d101acf19b5145c3d4e9299adb"
version = "kubernetes-1.16.0"

[[override]]
[[constraint]]
name = "k8s.io/client-go"
# revision for tag "kubernetes-1.14.6"
revision = "7e43eff7c80aab1d14728f84248931b9db28bdc0"
version = "kubernetes-1.16.0"

[[override]]
name = "github.com/coreos/prometheus-operator"
version = "=v0.30.0"

[[override]]
[[constraint]]
name = "sigs.k8s.io/controller-runtime"
version = "=v0.3.0"
version = "=v0.5.0"

[[override]]
name = "istio.io/api"
source = "https://github.com/aslakknutsen/istio-api.git"
branch = "istio-8772"
[[constraint]]
name = "istio.io/client-go"
branch = "release-1.4"

[[constraint]]
name = "github.com/operator-framework/operator-sdk"
version = "=0.17.0"

[[override]]
name = "k8s.io/kube-openapi"
revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"

# Workaround for https://github.com/golang/dep/issues/1799
# Otherwise ginkgo/gomega won't be pulled in
[[override]]
name = "gopkg.in/fsnotify.v1"
source = "https://github.com/fsnotify/fsnotify.git"

[[constraint]]
name = "github.com/openshift/api"
# v3.9.0 (which was a tag on that commit) does not exist anymore
revision = "0d921e363e951d89f583292c60d013c318df64dc"
branch = "release-4.3"

[[constraint]]
name = "github.com/go-cmd/cmd"
Expand Down Expand Up @@ -121,3 +104,35 @@ required = [
[[constraint]]
name = "github.com/google/go-github"
version = "=v31.0.0"

# Overrides
[[override]]
name = "k8s.io/kube-openapi"
branch = "release-1.16"

[[override]]
name = "github.com/coreos/prometheus-operator"
version = "=v0.34.0"

[[override]]
name = "istio.io/api"
branch = "release-1.4"

## Locking k8s/{klog,utils,gengo} to before [email protected] as otherwise we are facing https://github.com/kubernetes/klog/issues/138
[[override]]
name = "k8s.io/utils"
revision = "5770800c2500f42361fa90f2d5df947d2c5db138"

[[override]]
name = "k8s.io/klog"
version = "v1.0.0"

[[override]]
name = "k8s.io/gengo"
revision = "793b05dca9b871fdc15aeaff1f201e141ef5afa7"

## Workaround for https://github.com/golang/dep/issues/1799 - see https://github.com/golang/dep/issues/1799#issuecomment-381190029
## Otherwise ginkgo/gomega won't be pulled in
[[override]]
name = "gopkg.in/fsnotify.v1"
source = "https://github.com/fsnotify/fsnotify.git"
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ all: deps format lint compile test ## Runs 'deps format lint test compile' targe
build-ci: deps format compile test # Like 'all', but without linter which is executed as separated PR check

.PHONY: compile
compile: codegen $(BINARY_DIR)/$(BINARY_NAME) ## Compiles binaries
compile: operator-codegen $(BINARY_DIR)/$(BINARY_NAME) ## Compiles binaries

.PHONY: test
test: codegen ## Runs tests
test: operator-codegen ## Runs tests
$(call header,"Running tests")
ginkgo -r -v --skipPackage=e2e ${args}

Expand All @@ -63,24 +63,24 @@ format: ## Removes unneeded imports and formats source code
goimports -l -w ./pkg/ ./cmd/ ./version/ ./test/ ./e2e/

.PHONY: lint-prepare
lint-prepare: deps codegen
lint-prepare: deps operator-codegen

.PHONY: lint
lint: lint-prepare ## Concurrently runs a whole bunch of static analysis tools
$(call header,"Running a whole bunch of static analysis tools")
golangci-lint run

GROUP_VERSIONS:="istio:v1alpha1"
GOPATH_1:=$(shell echo ${GOPATH} | cut -d':' -f 1)
.PHONY: codegen
codegen: $(PROJECT_DIR)/bin/operator-sdk $(PROJECT_DIR)/$(ASSETS) ## Generates operator-sdk code and bundles packages using go-bindata
.PHONY: operator-codegen
operator-codegen: $(PROJECT_DIR)/bin/operator-sdk $(PROJECT_DIR)/$(ASSETS) ## Generates operator-sdk code and bundles packages using go-bindata
$(call header,"Generates operator-sdk code")
GOPATH=$(GOPATH_1) $(PROJECT_DIR)/bin/operator-sdk generate k8s
$(call header,"Generates clientset code")
GOPATH=$(GOPATH_1) ./vendor/k8s.io/code-generator/generate-groups.sh client \
$(PACKAGE_NAME)/pkg/client \
$(PACKAGE_NAME)/pkg/apis \
$(GROUP_VERSIONS)
"istio:v1alpha1" \
--go-header-file ./scripts/boilerplate.txt

# ##########################################################################
# Build configuration
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/addtoscheme_istio_networking_v1alpha3.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package apis

import (
"istio.io/api/pkg/kube/apis/networking/v1alpha3"
"istio.io/client-go/pkg/apis/networking/v1alpha3"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/istio/v1alpha1/zz_generated.deepcopy.go

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

23 changes: 7 additions & 16 deletions pkg/client/clientset/versioned/clientset.go

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

16 changes: 0 additions & 16 deletions pkg/client/clientset/versioned/doc.go

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

23 changes: 6 additions & 17 deletions pkg/client/clientset/versioned/fake/clientset_generated.go

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

16 changes: 0 additions & 16 deletions pkg/client/clientset/versioned/fake/doc.go

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

16 changes: 0 additions & 16 deletions pkg/client/clientset/versioned/fake/register.go

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

16 changes: 0 additions & 16 deletions pkg/client/clientset/versioned/scheme/doc.go

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

16 changes: 0 additions & 16 deletions pkg/client/clientset/versioned/scheme/register.go

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

16 changes: 0 additions & 16 deletions pkg/client/clientset/versioned/typed/istio/v1alpha1/doc.go

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

Loading