Skip to content

Commit

Permalink
Operator upgrades
Browse files Browse the repository at this point in the history
This change does the following:
 - Upgrades the operator SDK from v0.13.0 to v.0.15.0
 - Upgrades alpine from 3.10 to 3.11
 - Upgrades all vendored dependencies
 - Adds a `make generate` workaround for the newer tooling version
  • Loading branch information
gabrieljackson committed Jan 27, 2020
1 parent dd8d8f3 commit a58b2ea
Show file tree
Hide file tree
Showing 464 changed files with 53,500 additions and 27,333 deletions.
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.PHONY: all check-style unittest generate build clean build-image operator-sdk yaml

OPERATOR_IMAGE ?= mattermost/mattermost-operator:test
SDK_VERSION = v0.13.0
SDK_VERSION = v0.15.0
MACHINE = $(shell uname -m)
BUILD_IMAGE = golang:1.13
BASE_IMAGE = alpine:3.10
BASE_IMAGE = alpine:3.11
GOROOT ?= $(shell go env GOROOT)
GOPATH ?= $(shell go env GOPATH)
GOFLAGS ?= $(GOFLAGS:) -mod=vendor
GO=go
Expand Down Expand Up @@ -63,7 +64,9 @@ govet: ## Runs govet against all packages.
@echo "govet success";

generate: operator-sdk ## Runs the kubernetes code-generators and openapi
build/operator-sdk generate k8s
## We have to manually export GOROOT here to get around the following issue:
## https://github.com/operator-framework/operator-sdk/issues/1854#issuecomment-525132306
GOROOT=$(GOROOT) build/operator-sdk generate k8s
build/operator-sdk generate crds

which ./bin/openapi-gen > /dev/null || GO111MODULE=on go build -o ./bin/openapi-gen k8s.io/kube-openapi/cmd/openapi-gen
Expand Down
2 changes: 1 addition & 1 deletion deploy/crds/mattermost.com_clusterinstallations_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
listKind: ClusterInstallationList
plural: clusterinstallations
singular: clusterinstallation
scope: ""
scope: Namespaced
subresources:
status: {}
validation:
Expand Down
2 changes: 1 addition & 1 deletion deploy/crds/mattermost.com_mattermostrestoredbs_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
listKind: MattermostRestoreDBList
plural: mattermostrestoredbs
singular: mattermostrestoredb
scope: ""
scope: Namespaced
subresources:
status: {}
validation:
Expand Down
37 changes: 27 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,47 @@ module github.com/mattermost/mattermost-operator
go 1.13

require (
github.com/banzaicloud/k8s-objectmatcher v1.0.1
cloud.google.com/go v0.52.0 // indirect
github.com/banzaicloud/k8s-objectmatcher v1.1.0
github.com/coreos/prometheus-operator v0.35.0 // indirect
github.com/go-logr/logr v0.1.0
github.com/go-openapi/spec v0.19.5
github.com/go-openapi/swag v0.19.6 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/json-iterator/go v1.1.9 // indirect
github.com/mattermost/blubr v0.0.0-20200113232543-f0ce67760aeb
github.com/minio/minio-operator v0.0.0-20191007061920-bdea7aa7032f
github.com/operator-framework/operator-sdk v0.13.0
github.com/minio/minio-operator v0.0.0-20200123180224-604167ea8cdb
github.com/operator-framework/operator-sdk v0.15.0
github.com/pborman/uuid v1.2.0
github.com/pkg/errors v0.8.1
github.com/presslabs/mysql-operator v0.3.3
github.com/pkg/errors v0.9.1
github.com/presslabs/mysql-operator v0.3.8
github.com/prometheus/client_golang v1.3.0 // indirect
github.com/prometheus/common v0.9.1 // indirect
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
golang.org/x/tools v0.0.0-20191212051200-825cb0626375 // indirect
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
go.uber.org/atomic v1.5.1 // indirect
go.uber.org/multierr v1.4.0 // indirect
go.uber.org/zap v1.13.0 // indirect
golang.org/x/crypto v0.0.0-20200117160349-530e935923ad // indirect
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82 // indirect
golang.org/x/tools v0.0.0-20200124144541-e0a7ba33caea // indirect
gopkg.in/yaml.v2 v2.2.8 // indirect
k8s.io/api v0.17.2
k8s.io/apimachinery v0.17.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/code-generator v0.16.4
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
k8s.io/utils v0.0.0-20200122174043-1e243dd1a584 // indirect
sigs.k8s.io/controller-runtime v0.4.0

)

// Pinned to kubernetes-1.16.2
replace (
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
k8s.io/api => k8s.io/api v0.0.0-20191016110408-35e52d86657a
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
Expand Down
255 changes: 237 additions & 18 deletions go.sum

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions vendor/cloud.google.com/go/compute/metadata/.repo-metadata.json

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

25 changes: 18 additions & 7 deletions vendor/cloud.google.com/go/compute/metadata/metadata.go

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

5 changes: 5 additions & 0 deletions vendor/github.com/BurntSushi/toml/.gitignore

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

15 changes: 15 additions & 0 deletions vendor/github.com/BurntSushi/toml/.travis.yml

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

3 changes: 3 additions & 0 deletions vendor/github.com/BurntSushi/toml/COMPATIBLE

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.

19 changes: 19 additions & 0 deletions vendor/github.com/BurntSushi/toml/Makefile

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

Loading

0 comments on commit a58b2ea

Please sign in to comment.