Skip to content

Add support for Rook 1.10 #84

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.

Sign up for GitHub

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

Merged
emosbaugh merged 4 commits into from
Nov 28, 2022
Merged

Add support for Rook 1.10 #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c06cbe1
Add support for Rook 1.10
emosbaugh Nov 22, 2022
a3dbb13
unit tests
emosbaugh Nov 26, 2022
f6840e6
review feedback
emosbaugh Nov 28, 2022
a879a87
Doc
emosbaugh Nov 28, 2022
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
9 changes: 8 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,18 @@ docker-image:
--build-arg git_sha="$(GIT_SHA)" \
--build-arg version="$(VERSION)" \
.
build-ttl.sh:

.PHONY: build-ttl.sh
build-ttl.sh: ## Build the EKCO Docker container and deploy it to ttl.sh for use in the development environment
docker build \
-t ttl.sh/${CURRENT_USER}/ekco:12h \
-f deploy/Dockerfile \
--build-arg git_sha=dev \
--build-arg version=dev \
.
docker push ttl.sh/${CURRENT_USER}/ekco:12h

.PHONY: generate-mocks
generate-mocks: ## Generate mocks tests for CLI and preflight. More info: https://github.com/golang/mock
go install github.com/golang/mock/mockgen@v1.6.0
mockgen -source=pkg/k8s/exec.go -destination=pkg/k8s/mock/mock_exec.go
53 changes: 27 additions & 26 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@ require (
github.com/blang/semver v3.5.1+incompatible
github.com/coreos/go-systemd/v22 v22.4.0
github.com/gin-gonic/gin v1.8.1
github.com/golang/mock v1.6.0
Copy link
Contributor

@camilamacedo86 camilamacedo86 Nov 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need to add this dep?

github.com/google/martian v2.1.0+incompatible
github.com/hashicorp/go-multierror v1.1.1
github.com/pkg/errors v0.9.1
github.com/projectcontour/contour v1.19.1
github.com/rook/rook v1.9.12
github.com/spf13/cobra v1.4.0
github.com/rook/rook v1.10.6
github.com/spf13/cobra v1.6.0
github.com/spf13/viper v1.8.1
github.com/stretchr/testify v1.8.0
go.etcd.io/etcd/client/v3 v3.5.5
go.uber.org/zap v1.23.0
go.undefinedlabs.com/scopeagent v0.1.12
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.25.2
k8s.io/apimachinery v0.25.2
k8s.io/client-go v0.25.2
k8s.io/api v0.25.3
k8s.io/apimachinery v0.25.3
k8s.io/client-go v0.25.3
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
k8s.io/utils v0.0.0-20221012122500-cfd413dd9e85
)
Expand All @@ -40,7 +41,6 @@ require (
github.com/armon/go-metrics v0.4.1 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/aws/aws-sdk-go v1.44.114 // indirect
github.com/beevik/ntp v0.2.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/boombuler/barcode v1.0.1 // indirect
Expand All @@ -49,17 +49,17 @@ require (
github.com/circonus-labs/circonusllhist v0.1.5 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/denverdino/aliyungo v0.0.0-20220929054937-e3c8bf5ad947 // indirect
github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
github.com/digitalocean/godo v1.86.0 // indirect
github.com/duosecurity/duo_api_golang v0.0.0-20220927171823-f4576e85b96c // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/logr v1.2.3 // indirect
Expand Down Expand Up @@ -111,20 +111,21 @@ require (
github.com/hashicorp/raft v1.3.11 // indirect
github.com/hashicorp/raft-boltdb/v2 v2.2.2 // indirect
github.com/hashicorp/vault v1.12.0 // indirect
github.com/hashicorp/vault/api v1.8.0 // indirect
github.com/hashicorp/vault/api v1.8.1 // indirect
github.com/hashicorp/vault/api/auth/approle v0.3.0 // indirect
github.com/hashicorp/vault/sdk v0.6.1-0.20221010215534-6545e24b6023 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jefferai/jsonx v1.0.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/joyent/triton-go v1.8.5 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20220811192603-abc54caa34ac // indirect
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20221103224036-07dde5c41fdd // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/libopenstorage/secrets v0.0.0-20210709082113-dde442ea20ec // indirect
github.com/libopenstorage/secrets v0.0.0-20220823020833-2ecadaf59d8a // indirect
github.com/linode/linodego v1.9.3 // indirect
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
github.com/magiconair/properties v1.8.6 // indirect
Expand Down Expand Up @@ -157,13 +158,14 @@ require (
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/pquerna/otp v1.3.0 // indirect
github.com/prometheus/client_golang v1.13.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/shirou/gopsutil/v3 v3.22.9 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/softlayer/softlayer-go v1.0.6 // indirect
github.com/sony/gobreaker v0.5.0 // indirect
github.com/spf13/afero v1.9.2 // indirect
Expand All @@ -183,26 +185,25 @@ require (
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/crypto v0.0.0-20221012134737-56aed061732a // indirect
golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 // indirect
golang.org/x/sys v0.0.0-20221010170243-090e33056c14 // indirect
golang.org/x/term v0.0.0-20220919170432-7a66f970e087 // indirect
golang.org/x/text v0.3.8 // indirect
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
golang.org/x/net v0.0.0-20221017152216-f25eb7ecb193 // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/term v0.0.0-20221017184919-83659145692c // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/time v0.1.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/api v0.98.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e // indirect
google.golang.org/grpc v1.50.0 // indirect
google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/cluster-bootstrap v0.0.0 // indirect
k8s.io/component-base v0.25.2 // indirect
k8s.io/component-base v0.25.3 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
sigs.k8s.io/controller-runtime v0.13.0 // indirect
Expand All @@ -212,7 +213,7 @@ require (
)

replace (
// from https://github.com/rook/rook/blob/v1.9.12/go.mod
// from https://github.com/rook/rook/blob/v1.10.6/go.mod
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
github.com/kubernetes-incubator/external-storage => github.com/libopenstorage/external-storage v0.20.4-openstorage-rc3
github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
Expand Down Expand Up @@ -251,7 +252,7 @@ replace (
k8s.io/sample-controller => k8s.io/sample-controller v0.25.2
)

// from https://github.com/rook/rook/blob/v1.9.12/go.mod
// from https://github.com/rook/rook/blob/v1.10.6/go.mod
exclude (
// This tag doesn't exist, but is imported by github.com/portworx/sched-ops.
github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc2
Expand Down
Loading