Skip to content

Bug 1874056: inline apiserver-lib-go ToFlagSlice to prevent k/k dep #347

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
openshift-merge-robot merged 2 commits into from
Sep 25, 2020
Merged

Bug 1874056: inline apiserver-lib-go ToFlagSlice to prevent k/k dep #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d64f85
inline apiserver-lib-go ToFlagSlice to prevent k/k dep
stlaz Sep 15, 2020
60bbddb
go mod tidy && go mod vendor
stlaz Sep 15, 2020
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
29 changes: 3 additions & 26 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
module github.com/openshift/cluster-authentication-operator

go 1.13
go 1.14

require (
github.com/davecgh/go-spew v1.1.1
github.com/getsentry/raven-go v0.2.1-0.20190513200303-c977f96e1095 // indirect
github.com/ghodss/yaml v1.0.0
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/openshift/api v0.0.0-20200827090112-c05698d102cf
github.com/openshift/apiserver-library-go v0.0.0-20200521171520-a7bc13e3e650
github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
github.com/openshift/library-go v0.0.0-20200921120329-c803a7b7bb2c
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5
go.uber.org/multierr v1.1.1-0.20180122172545-ddea229ff1df // indirect
gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.19.0
Expand All @@ -29,27 +29,4 @@ require (
sigs.k8s.io/kube-storage-version-migrator v0.0.3
)

replace (
k8s.io/api => k8s.io/api v0.19.0-rc.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0-rc.2
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0-rc.2
k8s.io/apiserver => k8s.io/apiserver v0.19.0-rc.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0-rc.2
k8s.io/client-go => k8s.io/client-go v0.19.0-rc.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0-rc.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0-rc.2
k8s.io/code-generator => k8s.io/code-generator v0.19.0-rc.2
k8s.io/component-base => k8s.io/component-base v0.19.0-rc.2
k8s.io/cri-api => k8s.io/cri-api v0.19.0-rc.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0-rc.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0-rc.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0-rc.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0-rc.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0-rc.2
k8s.io/kubectl => k8s.io/kubectl v0.19.0-rc.2
k8s.io/kubelet => k8s.io/kubelet v0.19.0-rc.2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.0-rc.2
k8s.io/metrics => k8s.io/metrics v0.19.0-rc.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0-rc.2
vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
)
replace vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
415 changes: 54 additions & 361 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 19 additions & 2 deletions pkg/operator/workload/sync_openshift_oauth_apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"errors"
"fmt"
"regexp"
"sort"
"strconv"
"strings"

operatorv1 "github.com/openshift/api/operator/v1"
"github.com/openshift/apiserver-library-go/pkg/configflags"
operatorconfigclient "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1"
"github.com/openshift/cluster-authentication-operator/pkg/controllers/common"
"github.com/openshift/cluster-authentication-operator/pkg/operator/assets"
Expand Down Expand Up @@ -136,7 +136,7 @@ func (c *OAuthAPIServerWorkload) syncDeployment(authOperator *operatorv1.Authent

// log level verbosity is taken from the spec always
operatorCfg.APIServerArguments["v"] = []string{loglevelToKlog(authOperator.Spec.LogLevel)}
operandFlags := configflags.ToFlagSlice(operatorCfg.APIServerArguments)
operandFlags := toFlagSlice(operatorCfg.APIServerArguments)

// use string replacer for simple things
r := strings.NewReplacer(
Expand Down Expand Up @@ -326,3 +326,20 @@ func maybeQuote(s string) string {

return s
}

// taken from apiserver-library-go so that we don't pull k/k dep to this repo
func toFlagSlice(args map[string][]string) []string {
var keys []string
for key := range args {
keys = append(keys, key)
}
sort.Strings(keys)

var flags []string
for _, key := range keys {
for _, token := range args[key] {
flags = append(flags, fmt.Sprintf("--%s=%v", key, token))
}
}
return flags
}
201 changes: 0 additions & 201 deletions vendor/github.com/openshift/apiserver-library-go/LICENSE
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions vendor/github.com/openshift/apiserver-library-go/pkg/configflags/audit.go
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions vendor/github.com/openshift/apiserver-library-go/pkg/configflags/helpers.go
View file
Open in desktop

This file was deleted.

Loading