Skip to content

Commit edda314

Browse files
deads2kdeads2k
committed
simplify tsb flags
1 parent 9868e98 commit edda314

File tree

3 files changed

+30
-63
lines changed

3 files changed

+30
-63
lines changed

‎contrib/completions/bash/openshift

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -38516,30 +38516,8 @@ _openshift_start_template-service-broker()
3851638516
local_nonpersistent_flags+=("--client-ca-file=")
3851738517
flags+=("--contention-profiling")
3851838518
local_nonpersistent_flags+=("--contention-profiling")
38519-
flags+=("--delete-collection-workers=")
38520-
local_nonpersistent_flags+=("--delete-collection-workers=")
38521-
flags+=("--deserialization-cache-size=")
38522-
local_nonpersistent_flags+=("--deserialization-cache-size=")
38523-
flags+=("--enable-garbage-collector")
38524-
local_nonpersistent_flags+=("--enable-garbage-collector")
3852538519
flags+=("--enable-swagger-ui")
3852638520
local_nonpersistent_flags+=("--enable-swagger-ui")
38527-
flags+=("--etcd-cafile=")
38528-
local_nonpersistent_flags+=("--etcd-cafile=")
38529-
flags+=("--etcd-certfile=")
38530-
local_nonpersistent_flags+=("--etcd-certfile=")
38531-
flags+=("--etcd-keyfile=")
38532-
local_nonpersistent_flags+=("--etcd-keyfile=")
38533-
flags+=("--etcd-prefix=")
38534-
local_nonpersistent_flags+=("--etcd-prefix=")
38535-
flags+=("--etcd-quorum-read")
38536-
local_nonpersistent_flags+=("--etcd-quorum-read")
38537-
flags+=("--etcd-servers=")
38538-
local_nonpersistent_flags+=("--etcd-servers=")
38539-
flags+=("--etcd-servers-overrides=")
38540-
local_nonpersistent_flags+=("--etcd-servers-overrides=")
38541-
flags+=("--experimental-encryption-provider-config=")
38542-
local_nonpersistent_flags+=("--experimental-encryption-provider-config=")
3854338521
flags+=("--profiling")
3854438522
local_nonpersistent_flags+=("--profiling")
3854538523
flags+=("--requestheader-allowed-names=")
@@ -38554,10 +38532,6 @@ _openshift_start_template-service-broker()
3855438532
local_nonpersistent_flags+=("--requestheader-username-headers=")
3855538533
flags+=("--secure-port=")
3855638534
local_nonpersistent_flags+=("--secure-port=")
38557-
flags+=("--storage-backend=")
38558-
local_nonpersistent_flags+=("--storage-backend=")
38559-
flags+=("--storage-media-type=")
38560-
local_nonpersistent_flags+=("--storage-media-type=")
3856138535
flags+=("--template-namespace=")
3856238536
local_nonpersistent_flags+=("--template-namespace=")
3856338537
flags+=("--tls-ca-file=")
@@ -38568,8 +38542,6 @@ _openshift_start_template-service-broker()
3856838542
local_nonpersistent_flags+=("--tls-private-key-file=")
3856938543
flags+=("--tls-sni-cert-key=")
3857038544
local_nonpersistent_flags+=("--tls-sni-cert-key=")
38571-
flags+=("--watch-cache")
38572-
local_nonpersistent_flags+=("--watch-cache")
3857338545
flags+=("--azure-container-registry-config=")
3857438546
flags+=("--google-json-key=")
3857538547
flags+=("--log-flush-frequency=")

‎contrib/completions/zsh/openshift

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -38665,30 +38665,8 @@ _openshift_start_template-service-broker()
3866538665
local_nonpersistent_flags+=("--client-ca-file=")
3866638666
flags+=("--contention-profiling")
3866738667
local_nonpersistent_flags+=("--contention-profiling")
38668-
flags+=("--delete-collection-workers=")
38669-
local_nonpersistent_flags+=("--delete-collection-workers=")
38670-
flags+=("--deserialization-cache-size=")
38671-
local_nonpersistent_flags+=("--deserialization-cache-size=")
38672-
flags+=("--enable-garbage-collector")
38673-
local_nonpersistent_flags+=("--enable-garbage-collector")
3867438668
flags+=("--enable-swagger-ui")
3867538669
local_nonpersistent_flags+=("--enable-swagger-ui")
38676-
flags+=("--etcd-cafile=")
38677-
local_nonpersistent_flags+=("--etcd-cafile=")
38678-
flags+=("--etcd-certfile=")
38679-
local_nonpersistent_flags+=("--etcd-certfile=")
38680-
flags+=("--etcd-keyfile=")
38681-
local_nonpersistent_flags+=("--etcd-keyfile=")
38682-
flags+=("--etcd-prefix=")
38683-
local_nonpersistent_flags+=("--etcd-prefix=")
38684-
flags+=("--etcd-quorum-read")
38685-
local_nonpersistent_flags+=("--etcd-quorum-read")
38686-
flags+=("--etcd-servers=")
38687-
local_nonpersistent_flags+=("--etcd-servers=")
38688-
flags+=("--etcd-servers-overrides=")
38689-
local_nonpersistent_flags+=("--etcd-servers-overrides=")
38690-
flags+=("--experimental-encryption-provider-config=")
38691-
local_nonpersistent_flags+=("--experimental-encryption-provider-config=")
3869238670
flags+=("--profiling")
3869338671
local_nonpersistent_flags+=("--profiling")
3869438672
flags+=("--requestheader-allowed-names=")
@@ -38703,10 +38681,6 @@ _openshift_start_template-service-broker()
3870338681
local_nonpersistent_flags+=("--requestheader-username-headers=")
3870438682
flags+=("--secure-port=")
3870538683
local_nonpersistent_flags+=("--secure-port=")
38706-
flags+=("--storage-backend=")
38707-
local_nonpersistent_flags+=("--storage-backend=")
38708-
flags+=("--storage-media-type=")
38709-
local_nonpersistent_flags+=("--storage-media-type=")
3871038684
flags+=("--template-namespace=")
3871138685
local_nonpersistent_flags+=("--template-namespace=")
3871238686
flags+=("--tls-ca-file=")
@@ -38717,8 +38691,6 @@ _openshift_start_template-service-broker()
3871738691
local_nonpersistent_flags+=("--tls-private-key-file=")
3871838692
flags+=("--tls-sni-cert-key=")
3871938693
local_nonpersistent_flags+=("--tls-sni-cert-key=")
38720-
flags+=("--watch-cache")
38721-
local_nonpersistent_flags+=("--watch-cache")
3872238694
flags+=("--azure-container-registry-config=")
3872338695
flags+=("--google-json-key=")
3872438696
flags+=("--log-flush-frequency=")

‎pkg/openservicebroker/cmd/server/start.go

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@ import (
1313
"github.com/openshift/origin/pkg/openservicebroker/server"
1414
)
1515

16-
const defaultEtcdPathPrefix = "/registry/templateservicebroker.openshift.io"
17-
1816
type TemplateServiceBrokerServerOptions struct {
19-
RecommendedOptions *genericoptions.RecommendedOptions
17+
// we don't have any storage, so we shouldn't use the recommended options
18+
SecureServing *genericoptions.SecureServingOptions
19+
Authentication *genericoptions.DelegatingAuthenticationOptions
20+
Authorization *genericoptions.DelegatingAuthorizationOptions
21+
Audit *genericoptions.AuditOptions
22+
Features *genericoptions.FeatureOptions
2023

2124
StdOut io.Writer
2225
StdErr io.Writer
@@ -26,7 +29,11 @@ type TemplateServiceBrokerServerOptions struct {
2629

2730
func NewTemplateServiceBrokerServerOptions(out, errOut io.Writer) *TemplateServiceBrokerServerOptions {
2831
o := &TemplateServiceBrokerServerOptions{
29-
RecommendedOptions: genericoptions.NewRecommendedOptions(defaultEtcdPathPrefix, server.Scheme, server.Codecs.LegacyCodec()),
32+
SecureServing: genericoptions.NewSecureServingOptions(),
33+
Authentication: genericoptions.NewDelegatingAuthenticationOptions(),
34+
Authorization: genericoptions.NewDelegatingAuthorizationOptions(),
35+
Audit: genericoptions.NewAuditOptions(),
36+
Features: genericoptions.NewFeatureOptions(),
3037

3138
StdOut: out,
3239
StdErr: errOut,
@@ -57,7 +64,11 @@ func NewCommandStartTemplateServiceBrokerServer(out, errOut io.Writer, stopCh <-
5764
}
5865

5966
flags := cmd.Flags()
60-
o.RecommendedOptions.AddFlags(flags)
67+
o.SecureServing.AddFlags(flags)
68+
o.Authentication.AddFlags(flags)
69+
o.Authorization.AddFlags(flags)
70+
o.Audit.AddFlags(flags)
71+
o.Features.AddFlags(flags)
6172
flags.StringSliceVar(&o.TemplateNamespaces, "template-namespace", o.TemplateNamespaces, "TemplateNamespaces indicates the namespace(s) in which the template service broker looks for templates to serve to the catalog.")
6273

6374
return cmd
@@ -73,12 +84,24 @@ func (o *TemplateServiceBrokerServerOptions) Complete() error {
7384

7485
func (o TemplateServiceBrokerServerOptions) Config() (*server.TemplateServiceBrokerConfig, error) {
7586
// TODO have a "real" external address
76-
if err := o.RecommendedOptions.SecureServing.MaybeDefaultWithSelfSignedCerts("localhost", nil, []net.IP{net.ParseIP("127.0.0.1")}); err != nil {
87+
if err := o.SecureServing.MaybeDefaultWithSelfSignedCerts("localhost", nil, []net.IP{net.ParseIP("127.0.0.1")}); err != nil {
7788
return nil, fmt.Errorf("error creating self-signed certificates: %v", err)
7889
}
7990

8091
serverConfig := genericapiserver.NewConfig(server.Codecs)
81-
if err := o.RecommendedOptions.ApplyTo(serverConfig); err != nil {
92+
if err := o.SecureServing.ApplyTo(serverConfig); err != nil {
93+
return nil, err
94+
}
95+
if err := o.Authentication.ApplyTo(serverConfig); err != nil {
96+
return nil, err
97+
}
98+
if err := o.Authorization.ApplyTo(serverConfig); err != nil {
99+
return nil, err
100+
}
101+
if err := o.Audit.ApplyTo(serverConfig); err != nil {
102+
return nil, err
103+
}
104+
if err := o.Features.ApplyTo(serverConfig); err != nil {
82105
return nil, err
83106
}
84107

0 commit comments

Comments
 (0)