Skip to content

Commit d115033

Browse files
committed
diagnostics: introduce AppCreate
1 parent 880bd69 commit d115033

23 files changed

+1301
-38
lines changed

contrib/completions/bash/oc

Lines changed: 134 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

contrib/completions/zsh/oc

Lines changed: 134 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/man/man1/.files_generated_oc

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/man/man1/oc-adm-diagnostics-appcreate.1

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/man/man1/oc-ex-diagnostics-appcreate.1

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/oc/admin/diagnostics/cluster.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset"
1818
clustdiags "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/cluster"
1919
agldiags "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/cluster/aggregated_logging"
20+
appcreate "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/cluster/app_create"
2021
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
2122
osclientcmd "github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
2223
projectclient "github.com/openshift/origin/pkg/project/generated/internalclientset"
@@ -30,6 +31,7 @@ import (
3031
func availableClusterDiagnostics() types.DiagnosticList {
3132
return types.DiagnosticList{
3233
&agldiags.AggregatedLogging{},
34+
appcreate.NewDefaultAppCreateDiagnostic(),
3335
&clustdiags.ClusterRegistry{},
3436
&clustdiags.ClusterRouter{},
3537
&clustdiags.ClusterRoles{},
@@ -95,6 +97,16 @@ func (o DiagnosticsOptions) buildClusterDiagnostics(rawConfig *clientcmdapi.Conf
9597
switch diagnosticName {
9698
case agldiags.AggregatedLoggingName:
9799
d = agldiags.NewAggregatedLogging(o.MasterConfigLocation, kclusterClient, oauthClient.Oauth(), projectClient.Project(), routeClient.Route(), oauthorizationClient.Authorization(), appsClient.Apps(), securityClient.Security())
100+
case appcreate.AppCreateName:
101+
ac := o.ParameterizedDiagnostics[diagnosticName].(*appcreate.AppCreate)
102+
ac.KubeClient = kclusterClient
103+
ac.ProjectClient = projectClient.Project()
104+
ac.RouteClient = routeClient
105+
ac.RoleBindingClient = oauthorizationClient.Authorization()
106+
ac.SARClient = kclusterClient.Authorization()
107+
ac.AppsClient = appsClient
108+
ac.PreventModification = o.PreventModification
109+
d = ac
98110
case clustdiags.NodeDefinitionsName:
99111
d = &clustdiags.NodeDefinitions{KubeClient: kclusterClient}
100112
case clustdiags.MasterNodeName:

pkg/oc/admin/diagnostics/diagnostics.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,8 @@ func bindIndividualFlags(diag types.ParameterizedDiagnostic, prefix string, flag
269269
flags.StringVar(target, name, param.Default.(string), param.Description)
270270
case *int:
271271
flags.IntVar(target, name, param.Default.(int), param.Description)
272+
case *int64:
273+
flags.Int64Var(target, name, param.Default.(int64), param.Description)
272274
case *bool:
273275
flags.BoolVar(target, name, param.Default.(bool), param.Description)
274276
default:

0 commit comments

Comments
 (0)