Skip to content
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
59 changes: 28 additions & 31 deletions components/access-management/go.mod
Original file line number Diff line number Diff line change
@@ -1,63 +1,60 @@
module github.com/kubeflow/kubeflow/components/access-management
module github.com/kubeflow/dashboard/components/access-management

go 1.17
go 1.20
Copy link
Member Author

Choose a reason for hiding this comment

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

Note: I was getting issues with 1.17 previously when running go mod tidy, that's why I updated this version:

go mod tidy
go: downloading github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7
go: downloading github.com/onsi/ginkgo v1.6.0
go: downloading github.com/onsi/gomega v1.4.2
go: downloading github.com/hpcloud/tail v1.0.0
go: downloading gopkg.in/fsnotify.v1 v1.4.7
go: finding module for package github.com/kubeflow/dashboard/components/profile-controller/api/v1beta1
go: downloading github.com/kubeflow/dashboard v0.0.0-20251008104113-dc123d01db8d
go: downloading github.com/kubeflow/dashboard/components/profile-controller v0.0.0-20251008104113-dc123d01db8d
go: found github.com/kubeflow/dashboard/components/profile-controller/api/v1beta1 in github.com/kubeflow/dashboard/components/profile-controller v0.0.0-20251008104113-dc123d01db8d
go: downloading sigs.k8s.io/controller-runtime v0.12.1
go: downloading github.com/prometheus/client_golang v1.12.1
go: downloading github.com/sirupsen/logrus v1.8.1
go: downloading istio.io/api v0.0.0-20220525153140-e3c48c9ac324
go: downloading istio.io/client-go v1.13.4
go: downloading github.com/stretchr/testify v1.7.0
go: downloading golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
go: downloading golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
go: downloading gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
go: downloading github.com/cespare/xxhash/v2 v2.1.2
go: downloading github.com/prometheus/common v0.32.1
go: downloading github.com/prometheus/procfs v0.7.3
go: downloading github.com/onsi/gomega v1.18.1
go: downloading golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
go: downloading google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368
go: downloading github.com/golang/glog v1.0.0
go: downloading github.com/google/btree v1.0.1
go: github.com/kubeflow/dashboard/components/access-management/kfam imports
        github.com/gorilla/mux loaded from github.com/gorilla/[email protected],
        but go 1.16 would select v1.8.0
go: github.com/kubeflow/dashboard/components/access-management/kfam imports
        k8s.io/apimachinery/pkg/labels imports
        github.com/golang/glog loaded from github.com/golang/[email protected],
        but go 1.16 would select v1.0.0
go: github.com/kubeflow/dashboard/components/access-management/kfam imports
        k8s.io/client-go/kubernetes imports
        k8s.io/client-go/discovery imports
        github.com/peterbourgon/diskv imports
        github.com/google/btree loaded from github.com/google/[email protected],
        but go 1.16 would select v1.0.1

To upgrade to the versions selected by go 1.16:
        go mod tidy -go=1.16 && go mod tidy -go=1.17
If reproducibility with go 1.16 is not needed:
        go mod tidy -compat=1.17
For other options, see:
        https://golang.org/doc/modules/pruning
go: github.com/kubeflow/dashboard/components/access-management/kfam imports
        github.com/gorilla/mux loaded from github.com/gorilla/[email protected],
        but go 1.16 would select v1.8.0
go: github.com/kubeflow/dashboard/components/access-management/kfam imports
        k8s.io/apimachinery/pkg/labels imports
        github.com/golang/glog loaded from github.com/golang/[email protected],
        but go 1.16 would select v1.0.0
go: github.com/kubeflow/dashboard/components/access-management/kfam imports
        k8s.io/client-go/kubernetes imports
        k8s.io/client-go/discovery imports
        github.com/peterbourgon/diskv imports
        github.com/google/btree loaded from github.com/google/[email protected],
        but go 1.16 would select v1.0.1

Copy link
Contributor

Choose a reason for hiding this comment

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

This could very well help resolve some Trivy vulnerabilities as well 😎


require (
github.com/gorilla/mux v1.7.2
github.com/kubeflow/kubeflow/components/profile-controller v0.0.0-20191008230951-321c1d3313b6
github.com/prometheus/client_golang v1.11.1
github.com/sirupsen/logrus v1.6.0
istio.io/api v0.0.0-20201125194658-3cee6a1d3ab4
istio.io/client-go v1.8.0
k8s.io/api v0.18.1
k8s.io/apimachinery v0.18.1
github.com/kubeflow/dashboard/components/profile-controller v0.0.0-20251008104113-dc123d01db8d
github.com/prometheus/client_golang v1.12.1
github.com/sirupsen/logrus v1.8.1
istio.io/api v0.0.0-20220525153140-e3c48c9ac324
istio.io/client-go v1.13.4
k8s.io/api v0.24.0
k8s.io/apimachinery v0.24.0
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
sigs.k8s.io/controller-runtime v0.2.0
sigs.k8s.io/controller-runtime v0.12.1
)

require (
cloud.google.com/go v0.38.0 // indirect
cloud.google.com/go v0.81.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-logr/logr v0.1.0 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/google/gofuzz v1.0.0 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
github.com/hashicorp/golang-lru v0.5.1 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/spf13/pflag v1.0.3 // indirect
github.com/stretchr/testify v1.6.1 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
google.golang.org/appengine v1.5.0 // indirect
google.golang.org/protobuf v1.26.0-rc.1 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a // indirect
)

replace (
Expand Down
536 changes: 417 additions & 119 deletions components/access-management/go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions components/access-management/kfam/api_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"strings"
"time"

profileRegister "github.com/kubeflow/kubeflow/components/access-management/pkg/apis/kubeflow/v1beta1"
profilev1beta1 "github.com/kubeflow/kubeflow/components/profile-controller/api/v1beta1"
profileRegister "github.com/kubeflow/dashboard/components/access-management/pkg/apis/kubeflow/v1beta1"
profilev1beta1 "github.com/kubeflow/dashboard/components/profile-controller/api/v1beta1"
log "github.com/sirupsen/logrus"
istioRegister "istio.io/client-go/pkg/apis/security/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion components/access-management/kfam/profiles.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package kfam

import (
"github.com/kubeflow/kubeflow/components/profile-controller/api/v1beta1"
"github.com/kubeflow/dashboard/components/profile-controller/api/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
Expand Down
4 changes: 2 additions & 2 deletions components/access-management/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
log "github.com/sirupsen/logrus"
"k8s.io/client-go/kubernetes/scheme"

"github.com/kubeflow/kubeflow/components/access-management/kfam"
profile "github.com/kubeflow/kubeflow/components/access-management/pkg/apis/kubeflow/v1beta1"
"github.com/kubeflow/dashboard/components/access-management/kfam"
profile "github.com/kubeflow/dashboard/components/access-management/pkg/apis/kubeflow/v1beta1"

istioSecurityClient "istio.io/client-go/pkg/apis/security/v1beta1"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ limitations under the License.
// Package v1alpha1 contains API Schema definitions for the kubeflow v1alpha1 API group
// +k8s:openapi-gen=true
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=github.com/kubeflow/kubeflow/components/profile-controller/pkg/apis/kubeflow
// +k8s:conversion-gen=github.com/kubeflow/dashboard/components/profile-controller/pkg/apis/kubeflow
// +k8s:defaulter-gen=TypeMeta
// +groupName=kubeflow.org
package v1beta1

import (
profilev1beta1 "github.com/kubeflow/kubeflow/components/profile-controller/api/v1beta1"
profilev1beta1 "github.com/kubeflow/dashboard/components/profile-controller/api/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------------
kubeflow/kubeflow Apache License 2.0 https://github.com/kubeflow/kubeflow/blob/master/LICENSE
kubeflow/dashboard Apache License 2.0 https://github.com/kubeflow/dashboard/blob/master/LICENSE
--------------------------------------------------------------------------------

Apache License
Expand Down
4 changes: 2 additions & 2 deletions components/access-management/third_party_licenses/dep.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github.com/kubeflow/kubeflow/components/access-management
github.com/kubeflow/dashboard/components/access-management
cloud.google.com/go
dmitri.shuralyov.com/app/changes
dmitri.shuralyov.com/html/belt
Expand Down Expand Up @@ -69,7 +69,7 @@ github.com/kr/logfmt
github.com/kr/pretty
github.com/kr/pty
github.com/kr/text
github.com/kubeflow/kubeflow/components/profile-controller
github.com/kubeflow/dashboard/components/profile-controller
github.com/markbates/inflect
github.com/mattn/go-colorable
github.com/mattn/go-isatty
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kubeflow/kubeflow,https://github.com/kubeflow/kubeflow/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/kubeflow/kubeflow/master/LICENSE
kubeflow/dashboard,https://github.com/kubeflow/dashboard/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/kubeflow/dashboard/master/LICENSE
GoogleCloudPlatform/gcloud-golang,https://github.com/googleapis/google-cloud-go/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/googleapis/google-cloud-go/master/LICENSE
apache/thrift,https://github.com/apache/thrift/blob/master/LICENSE,Apache License 2.0,https://raw.githubusercontent.com/apache/thrift/master/LICENSE
BurntSushi/toml,https://github.com/BurntSushi/toml/blob/master/COPYING,MIT License,https://raw.githubusercontent.com/BurntSushi/toml/master/COPYING
Expand Down
2 changes: 1 addition & 1 deletion components/access-management/third_party_licenses/repo.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kubeflow/kubeflow
kubeflow/dashboard
GoogleCloudPlatform/gcloud-golang
apache/thrift
BurntSushi/toml
Expand Down