Skip to content

Commit

Permalink
Merge branch 'master' into fix-codescanning-incorrect-intconv
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Oct 28, 2024
2 parents 263c9fb + 227a815 commit f6799db
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 100 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ dockers:
build_flag_templates:
- "--pull"
- "--build-arg=kan_tools_version={{ .Tag }}"
- "--build-arg=kopia_build_commit=befa16ef4c81"
- "--build-arg=kopia_build_commit=1bceb7155ede"
- "--build-arg=kopia_repo_org=kopia"
extra_files:
- 'LICENSE'
Expand Down
43 changes: 1 addition & 42 deletions ROADMAP.md
Original file line number Diff line number Diff line change
@@ -1,42 +1 @@
# Kanister Roadmap

Please join the Kanister community to give feedback on the roadmap
and open issues with your suggestions.

## Project and [Governance](Governance.md) Work

1. Lifecycle for contributors: Roles, Privs, and lifecycle
1. project admin?
2. maintainer (core)
3. reviewer+approval: PR + branch protections?
4. contributor
2. Blueprints Maintenance and Support Policy
1. project test matrix: Kopia vs Restic vs Stow, downstream adopters vs Kanister standalone
2. community maintained examples: move to a new public repo

## Development Work

### Prioritized (Doing):
1. Fork block storage functions, deprecate unused Kanister code
1. Kopia.io Repository Controller with a CR to control the lifecycle of a Kopia Repository Server
1. Replace [github.com/pkg/errors](http://github.com/pkg/errors) package with a supported fork = https://github.com/kanisterio/kanister/issues/1838
1. Release notes
1. [Adopt OpenSSF Best Practices Badge](https://github.com/kanisterio/kanister/issues/2783)

### Backlog: (Ideas and maintenance, unprioritized)

#### Discussion and Issues to be created/qualified:
1. Track and log events triggered by Blueprint Actions: @PrasadG193 to create
1. Vault integration for Repository Server secrets: @mlavi to create
1. Deprecate Restic, blocked on Kopia work: @e-sumin to create
1. Replace http://gopkg.in/check.v1 with a better test framework
1. Plugability of data mover; S3 and more: GH discussion attempt; add to agenda
1. App mobility: discussion

#### Existing Requests
1. [ARM support](https://github.com/kanisterio/kanister/issues/2254)
1. Generate Kanister controller using KubeBuilder - currently based on Rook operator
resurrect https://github.com/kanisterio/kanister/issues/193
1. Merge the Repository controller into the Kanister controller.
1. Support for creation of blueprints/actionsets in application namespaces https://github.com/kanisterio/kanister/discussions/2922
1. Support iterating over multiple resources with the same function https://github.com/kanisterio/kanister/discussions/3001
Roadmap was moved to [the Wiki page](https://github.com/kanisterio/kanister/wiki/Roadmap)
40 changes: 19 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/kanisterio/kanister

go 1.22

toolchain go1.22.7
go 1.22.7

replace (
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
Expand All @@ -17,7 +15,7 @@ replace (
// dependencies in the require block following this one.
require (
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.15.0
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0
Expand All @@ -36,7 +34,7 @@ require (
github.com/json-iterator/go v1.1.12
github.com/kanisterio/errkit v0.0.2
github.com/kanisterio/safecli v0.0.8
github.com/kopia/kopia v0.17.1-0.20240910011011-befa16ef4c81
github.com/kopia/kopia v0.17.1-0.20240927044625-1bceb7155ede
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
github.com/lib/pq v1.10.9
github.com/mitchellh/mapstructure v1.5.0
Expand All @@ -52,7 +50,7 @@ require (
go.uber.org/zap v1.27.0
golang.org/x/oauth2 v0.23.0
gonum.org/v1/gonum v0.15.1
google.golang.org/api v0.200.0
google.golang.org/api v0.203.0
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637

Expand All @@ -70,14 +68,14 @@ require (
)

require (
cloud.google.com/go v0.115.1 // indirect
cloud.google.com/go/auth v0.9.8 // indirect
cloud.google.com/go v0.116.0 // indirect
cloud.google.com/go/auth v0.9.9 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
cloud.google.com/go/compute/metadata v0.5.2 // indirect
cloud.google.com/go/iam v1.2.1 // indirect
cloud.google.com/go/storage v1.43.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 // indirect; indirect;
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.1 // indirect; indirect;
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
Expand Down Expand Up @@ -149,11 +147,11 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.10 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/klauspost/reedsolomon v1.12.4 // indirect
github.com/kopia/htmluibuild v0.0.1-0.20240905025602-b5c84c3f1de4 // indirect
github.com/kopia/htmluibuild v0.0.1-0.20240912224500-5af34214520c // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
Expand Down Expand Up @@ -197,18 +195,18 @@ require (
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.starlark.net v0.0.0-20240314022150-ee8ed142361c // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
Expand All @@ -217,9 +215,9 @@ require (
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto v0.0.0-20241007155032-5fefd90f89a9 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.35.1
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down
Loading

0 comments on commit f6799db

Please sign in to comment.