Skip to content

Commit

Permalink
Require api endpoint (#71)
Browse files Browse the repository at this point in the history
  • Loading branch information
robertvolkmann authored Mar 6, 2024
1 parent 86fcdca commit b6b470a
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 90 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
cache: false

- name: Lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v4
with:
args: --build-tags integration -p bugs -p unused --timeout=5m

Expand Down
3 changes: 1 addition & 2 deletions controllers/duros_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/predicate"

"github.com/metal-stack/duros-go"
durosv2 "github.com/metal-stack/duros-go/api/duros/v2"

duroscontrollerv1 "github.com/metal-stack/duros-controller/api/v1"
Expand All @@ -50,7 +49,7 @@ type DurosReconciler struct {
Log logr.Logger
Namespace string
DurosClient durosv2.DurosAPIClient
Endpoints duros.EPs
Endpoints string
AdminKey []byte
PSPDisabled bool
}
Expand Down
2 changes: 1 addition & 1 deletion controllers/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ func (r *DurosReconciler) deployCSI(ctx context.Context, projectID string, scs [
obj.Parameters = map[string]string{
"mgmt-scheme": "grpcs",
"compression": "disabled",
"mgmt-endpoint": r.Endpoints.String(),
"mgmt-endpoint": r.Endpoints,
"project-name": projectID,
"replica-count": strconv.Itoa(sc.ReplicaCount),
"csi.storage.k8s.io/controller-expand-secret-name": storageClassCredentialsRef,
Expand Down
28 changes: 14 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ go 1.22

require (
github.com/go-logr/logr v1.4.1
github.com/go-logr/zapr v1.3.0
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.2.0
github.com/metal-stack/duros-go v0.4.5
github.com/metal-stack/duros-go v0.4.7
github.com/metal-stack/v v1.0.3
go.uber.org/zap v1.26.0
google.golang.org/grpc v1.61.1
google.golang.org/grpc v1.62.1
k8s.io/api v0.26.10
k8s.io/apimachinery v0.28.2
k8s.io/client-go v0.26.10
Expand All @@ -25,18 +23,19 @@ require (
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic v0.7.0 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -54,19 +53,20 @@ require (
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/goleak v1.3.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/term v0.17.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/protobuf v1.32.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit b6b470a

Please sign in to comment.