Skip to content
This repository was archived by the owner on Mar 20, 2026. It is now read-only.
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
2 changes: 1 addition & 1 deletion .github/workflows/goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.24.x
go-version: 1.26.x
- # Add support for more platforms with QEMU (optional)
# https://github.com/docker/setup-qemu-action
name: Set up QEMU
Expand Down
70 changes: 36 additions & 34 deletions .github/workflows/kubernetes-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,35 @@ concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true
jobs:
shellcheck:
timeout-minutes: 30
name: Shellcheck
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ 1.24.x ]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
env:
SHELLCHECK_OPTS: -e SC2046 -e SC1091 -e SC2086 -e SC2090 -e SC2089 -e SC2006 -e SC2206
- name: Run nancy vulnerability report
run: |
nancy_version=$(curl --retry 10 -Ls -o /dev/null -w "%{url_effective}" https://github.com/sonatype-nexus-community/nancy/releases/latest | sed "s/https:\/\/github.com\/sonatype-nexus-community\/nancy\/releases\/tag\///")
curl -L -o nancy https://github.com/sonatype-nexus-community/nancy/releases/download/${nancy_version}/nancy-${nancy_version}-linux-amd64 && chmod +x nancy
go list -deps -json ./... | jq -s 'unique_by(.Module.Path)|.[]|select(has("Module"))|.Module' | ./nancy sleuth
# Nancy seems to require a token to in v1.2.0
#
# shellcheck:
# timeout-minutes: 30
# name: Shellcheck
# runs-on: ubuntu-latest
# strategy:
# matrix:
# go-version: [ 1.26.x ]
# steps:
# - uses: actions/checkout@v3
# - uses: actions/setup-go@v4
# with:
# go-version: ${{ matrix.go-version }}
# - name: Run ShellCheck
# uses: ludeeus/action-shellcheck@master
# env:
# SHELLCHECK_OPTS: -e SC2046 -e SC1091 -e SC2086 -e SC2090 -e SC2089 -e SC2006 -e SC2206
# - name: Run nancy vulnerability report
# run: |
# nancy_version=$(curl --retry 10 -Ls -o /dev/null -w "%{url_effective}" https://github.com/sonatype-nexus-community/nancy/releases/latest | sed "s/https:\/\/github.com\/sonatype-nexus-community\/nancy\/releases\/tag\///")
# curl -L -o nancy https://github.com/sonatype-nexus-community/nancy/releases/download/${nancy_version}/nancy-${nancy_version}-linux-amd64 && chmod +x nancy
# go list -deps -json ./... | jq -s 'unique_by(.Module.Path)|.[]|select(has("Module"))|.Module' | ./nancy sleuth
lint:
timeout-minutes: 30
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -48,7 +50,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -65,7 +67,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
steps:
- name: Check out code
uses: actions/checkout@v3
Expand All @@ -89,7 +91,7 @@ jobs:
- govet
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -107,10 +109,10 @@ jobs:
- lint
- vulnerable-dependencies-checks
- govet
- shellcheck
# - shellcheck
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -134,7 +136,7 @@ jobs:
- operator
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -158,7 +160,7 @@ jobs:
- operator
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -182,7 +184,7 @@ jobs:
- operator
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
os: [ ubuntu-latest ]

steps:
Expand All @@ -206,7 +208,7 @@ jobs:
- operator
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
os: [ ubuntu-latest ]
steps:
- uses: actions/checkout@v3
Expand All @@ -229,7 +231,7 @@ jobs:
- operator
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
os: [ ubuntu-latest ]
steps:
- name: Free Disk Space (Ubuntu)
Expand Down Expand Up @@ -263,7 +265,7 @@ jobs:
- operator
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
os: [ ubuntu-latest ]

# Steps represent a sequence of tasks that will be executed as part of the job
Expand Down Expand Up @@ -294,7 +296,7 @@ jobs:
- operator
strategy:
matrix:
go-version: [ 1.24.x ]
go-version: [ 1.26.x ]
os: [ ubuntu-latest ]

# Steps represent a sequence of tasks that will be executed as part of the job
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ 1.21.x ]
go-version: [ 1.24.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ 1.21.x ]
go-version: [ 1.24.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.21.x ]
go-version: [ 1.24.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ 1.21.x ]
go-version: [ 1.24.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand All @@ -181,7 +181,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.21.x ]
go-version: [ 1.24.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.21.x ]
go-version: [ 1.24.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.21.x ]
go-version: [ 1.24.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down Expand Up @@ -315,7 +315,7 @@ jobs:

strategy:
matrix:
go-version: [ 1.21.x ]
go-version: [ 1.24.x ]

steps:

Expand Down Expand Up @@ -359,7 +359,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [ 1.21.x ]
go-version: [ 1.24.x ]
os: [ ubuntu-latest ]
steps:
- name: Check out code
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ for [kustomize](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kusto
use that to install MiniO Operator.

```sh
kubectl kustomize github.com/minio/operator\?ref=v5.0.18
kubectl kustomize github.com/minio/operator\?ref=v5.0.19
```

Run the following command to verify the status of the Operator:
Expand Down
2 changes: 1 addition & 1 deletion api/marketplace.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func postMPIntegrationResponse(session *models.Principal, params operator_api.Po

func setMPIntegration(ctx context.Context, email string, isInEU bool, clientSet K8sClientI) *models.Error {
if email == "" {
return ErrorWithContext(ctx, ErrBadRequest, fmt.Errorf(emailNotSetMsg))
return ErrorWithContext(ctx, ErrBadRequest, fmt.Errorf("%s", emailNotSetMsg))
}
if _, err := setMPEmail(ctx, email, isInEU, clientSet); err != nil {
return ErrorWithContext(ctx, err)
Expand Down
26 changes: 13 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/minio/operator

go 1.23.0
go 1.26.0

toolchain go1.24.2
toolchain go1.26.1

require (
github.com/blang/semver/v4 v4.0.0
github.com/docker/cli v24.0.7+incompatible
github.com/docker/cli v29.2.0+incompatible
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fatih/color v1.16.0
github.com/go-openapi/errors v0.21.0
Expand Down Expand Up @@ -40,12 +40,12 @@ require (
github.com/stretchr/testify v1.9.0
github.com/tidwall/gjson v1.17.0
github.com/unrolled/secure v1.14.0
golang.org/x/crypto v0.36.0
golang.org/x/net v0.38.0
golang.org/x/oauth2 v0.23.0
golang.org/x/crypto v0.48.0
golang.org/x/net v0.49.0
golang.org/x/oauth2 v0.35.0
// Added to include security fix for
// https://github.com/golang/go/issues/56152
golang.org/x/text v0.23.0 // indirect
golang.org/x/text v0.34.0 // indirect
golang.org/x/time v0.7.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.32.3
Expand All @@ -61,7 +61,7 @@ require (
require (
github.com/go-test/deep v1.1.0
github.com/minio/kes-go v0.2.1
golang.org/x/mod v0.21.0
golang.org/x/mod v0.32.0
sigs.k8s.io/controller-runtime v0.20.4
)

Expand All @@ -85,7 +85,6 @@ require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v27.1.2+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.3 // indirect
Expand Down Expand Up @@ -181,10 +180,11 @@ require (
go.mongodb.org/mongo-driver v1.13.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/sync v0.12.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/term v0.30.0 // indirect
golang.org/x/tools v0.26.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.41.0 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/tools v0.41.0 // indirect
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
google.golang.org/grpc v1.65.0 // indirect
Expand Down
Loading
Loading