Skip to content

Commit 14ade1a

Browse files
sosiouxmesosiouxme
committed
diagnostics: introduce AppCreate
1 parent 06c0711 commit 14ade1a

23 files changed

+1239
-38
lines changed

‎contrib/completions/bash/oc

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2424,6 +2424,40 @@ _oc_adm_diagnostics_all()
24242424
flags_with_completion=()
24252425
flags_completion=()
24262426

2427+
flags+=("--appcreate-app-image=")
2428+
local_nonpersistent_flags+=("--appcreate-app-image=")
2429+
flags+=("--appcreate-app-name=")
2430+
local_nonpersistent_flags+=("--appcreate-app-name=")
2431+
flags+=("--appcreate-app-port=")
2432+
local_nonpersistent_flags+=("--appcreate-app-port=")
2433+
flags+=("--appcreate-deploy-timeout=")
2434+
local_nonpersistent_flags+=("--appcreate-deploy-timeout=")
2435+
flags+=("--appcreate-http-retries=")
2436+
local_nonpersistent_flags+=("--appcreate-http-retries=")
2437+
flags+=("--appcreate-http-timeout=")
2438+
local_nonpersistent_flags+=("--appcreate-http-timeout=")
2439+
flags+=("--appcreate-keep-app")
2440+
local_nonpersistent_flags+=("--appcreate-keep-app")
2441+
flags+=("--appcreate-keep-project")
2442+
local_nonpersistent_flags+=("--appcreate-keep-project")
2443+
flags+=("--appcreate-node-selector=")
2444+
local_nonpersistent_flags+=("--appcreate-node-selector=")
2445+
flags+=("--appcreate-project=")
2446+
local_nonpersistent_flags+=("--appcreate-project=")
2447+
flags+=("--appcreate-project-base=")
2448+
local_nonpersistent_flags+=("--appcreate-project-base=")
2449+
flags+=("--appcreate-result-dir=")
2450+
local_nonpersistent_flags+=("--appcreate-result-dir=")
2451+
flags+=("--appcreate-route-host=")
2452+
local_nonpersistent_flags+=("--appcreate-route-host=")
2453+
flags+=("--appcreate-route-port=")
2454+
local_nonpersistent_flags+=("--appcreate-route-port=")
2455+
flags+=("--appcreate-skip-route-connect")
2456+
local_nonpersistent_flags+=("--appcreate-skip-route-connect")
2457+
flags+=("--appcreate-skip-route-test")
2458+
local_nonpersistent_flags+=("--appcreate-skip-route-test")
2459+
flags+=("--appcreate-skip-service-connect")
2460+
local_nonpersistent_flags+=("--appcreate-skip-service-connect")
24272461
flags+=("--cluster-context=")
24282462
local_nonpersistent_flags+=("--cluster-context=")
24292463
flags+=("--config=")
@@ -2555,6 +2589,100 @@ _oc_adm_diagnostics_analyzelogs()
25552589
noun_aliases=()
25562590
}
25572591

2592+
_oc_adm_diagnostics_appcreate()
2593+
{
2594+
last_command="oc_adm_diagnostics_appcreate"
2595+
commands=()
2596+
2597+
flags=()
2598+
two_word_flags=()
2599+
local_nonpersistent_flags=()
2600+
flags_with_completion=()
2601+
flags_completion=()
2602+
2603+
flags+=("--app-image=")
2604+
local_nonpersistent_flags+=("--app-image=")
2605+
flags+=("--app-name=")
2606+
local_nonpersistent_flags+=("--app-name=")
2607+
flags+=("--app-port=")
2608+
local_nonpersistent_flags+=("--app-port=")
2609+
flags+=("--cluster-context=")
2610+
local_nonpersistent_flags+=("--cluster-context=")
2611+
flags+=("--config=")
2612+
flags_with_completion+=("--config")
2613+
flags_completion+=("_filedir")
2614+
local_nonpersistent_flags+=("--config=")
2615+
flags+=("--context=")
2616+
local_nonpersistent_flags+=("--context=")
2617+
flags+=("--deploy-timeout=")
2618+
local_nonpersistent_flags+=("--deploy-timeout=")
2619+
flags+=("--diaglevel=")
2620+
two_word_flags+=("-l")
2621+
local_nonpersistent_flags+=("--diaglevel=")
2622+
flags+=("--http-retries=")
2623+
local_nonpersistent_flags+=("--http-retries=")
2624+
flags+=("--http-timeout=")
2625+
local_nonpersistent_flags+=("--http-timeout=")
2626+
flags+=("--keep-app")
2627+
local_nonpersistent_flags+=("--keep-app")
2628+
flags+=("--keep-project")
2629+
local_nonpersistent_flags+=("--keep-project")
2630+
flags+=("--loglevel=")
2631+
local_nonpersistent_flags+=("--loglevel=")
2632+
flags+=("--logspec=")
2633+
local_nonpersistent_flags+=("--logspec=")
2634+
flags+=("--node-selector=")
2635+
local_nonpersistent_flags+=("--node-selector=")
2636+
flags+=("--prevent-modification")
2637+
local_nonpersistent_flags+=("--prevent-modification")
2638+
flags+=("--project=")
2639+
local_nonpersistent_flags+=("--project=")
2640+
flags+=("--project-base=")
2641+
local_nonpersistent_flags+=("--project-base=")
2642+
flags+=("--result-dir=")
2643+
local_nonpersistent_flags+=("--result-dir=")
2644+
flags+=("--route-host=")
2645+
local_nonpersistent_flags+=("--route-host=")
2646+
flags+=("--route-port=")
2647+
local_nonpersistent_flags+=("--route-port=")
2648+
flags+=("--skip-route-connect")
2649+
local_nonpersistent_flags+=("--skip-route-connect")
2650+
flags+=("--skip-route-test")
2651+
local_nonpersistent_flags+=("--skip-route-test")
2652+
flags+=("--skip-service-connect")
2653+
local_nonpersistent_flags+=("--skip-service-connect")
2654+
flags+=("--v=")
2655+
local_nonpersistent_flags+=("--v=")
2656+
flags+=("--vmodule=")
2657+
local_nonpersistent_flags+=("--vmodule=")
2658+
flags+=("--as=")
2659+
flags+=("--as-group=")
2660+
flags+=("--cache-dir=")
2661+
flags+=("--certificate-authority=")
2662+
flags_with_completion+=("--certificate-authority")
2663+
flags_completion+=("_filedir")
2664+
flags+=("--client-certificate=")
2665+
flags_with_completion+=("--client-certificate")
2666+
flags_completion+=("_filedir")
2667+
flags+=("--client-key=")
2668+
flags_with_completion+=("--client-key")
2669+
flags_completion+=("_filedir")
2670+
flags+=("--cluster=")
2671+
flags+=("--insecure-skip-tls-verify")
2672+
flags+=("--log-flush-frequency=")
2673+
flags+=("--match-server-version")
2674+
flags+=("--namespace=")
2675+
two_word_flags+=("-n")
2676+
flags+=("--request-timeout=")
2677+
flags+=("--server=")
2678+
flags+=("--token=")
2679+
flags+=("--user=")
2680+
2681+
must_have_one_flag=()
2682+
must_have_one_noun=()
2683+
noun_aliases=()
2684+
}
2685+
25582686
_oc_adm_diagnostics_clusterregistry()
25592687
{
25602688
last_command="oc_adm_diagnostics_clusterregistry"
@@ -3550,6 +3678,7 @@ _oc_adm_diagnostics()
35503678
commands+=("aggregatedlogging")
35513679
commands+=("all")
35523680
commands+=("analyzelogs")
3681+
commands+=("appcreate")
35533682
commands+=("clusterregistry")
35543683
commands+=("clusterrolebindings")
35553684
commands+=("clusterroles")

‎contrib/completions/zsh/oc

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2566,6 +2566,40 @@ _oc_adm_diagnostics_all()
25662566
flags_with_completion=()
25672567
flags_completion=()
25682568

2569+
flags+=("--appcreate-app-image=")
2570+
local_nonpersistent_flags+=("--appcreate-app-image=")
2571+
flags+=("--appcreate-app-name=")
2572+
local_nonpersistent_flags+=("--appcreate-app-name=")
2573+
flags+=("--appcreate-app-port=")
2574+
local_nonpersistent_flags+=("--appcreate-app-port=")
2575+
flags+=("--appcreate-deploy-timeout=")
2576+
local_nonpersistent_flags+=("--appcreate-deploy-timeout=")
2577+
flags+=("--appcreate-http-retries=")
2578+
local_nonpersistent_flags+=("--appcreate-http-retries=")
2579+
flags+=("--appcreate-http-timeout=")
2580+
local_nonpersistent_flags+=("--appcreate-http-timeout=")
2581+
flags+=("--appcreate-keep-app")
2582+
local_nonpersistent_flags+=("--appcreate-keep-app")
2583+
flags+=("--appcreate-keep-project")
2584+
local_nonpersistent_flags+=("--appcreate-keep-project")
2585+
flags+=("--appcreate-node-selector=")
2586+
local_nonpersistent_flags+=("--appcreate-node-selector=")
2587+
flags+=("--appcreate-project=")
2588+
local_nonpersistent_flags+=("--appcreate-project=")
2589+
flags+=("--appcreate-project-base=")
2590+
local_nonpersistent_flags+=("--appcreate-project-base=")
2591+
flags+=("--appcreate-result-dir=")
2592+
local_nonpersistent_flags+=("--appcreate-result-dir=")
2593+
flags+=("--appcreate-route-host=")
2594+
local_nonpersistent_flags+=("--appcreate-route-host=")
2595+
flags+=("--appcreate-route-port=")
2596+
local_nonpersistent_flags+=("--appcreate-route-port=")
2597+
flags+=("--appcreate-skip-route-connect")
2598+
local_nonpersistent_flags+=("--appcreate-skip-route-connect")
2599+
flags+=("--appcreate-skip-route-test")
2600+
local_nonpersistent_flags+=("--appcreate-skip-route-test")
2601+
flags+=("--appcreate-skip-service-connect")
2602+
local_nonpersistent_flags+=("--appcreate-skip-service-connect")
25692603
flags+=("--cluster-context=")
25702604
local_nonpersistent_flags+=("--cluster-context=")
25712605
flags+=("--config=")
@@ -2697,6 +2731,100 @@ _oc_adm_diagnostics_analyzelogs()
26972731
noun_aliases=()
26982732
}
26992733

2734+
_oc_adm_diagnostics_appcreate()
2735+
{
2736+
last_command="oc_adm_diagnostics_appcreate"
2737+
commands=()
2738+
2739+
flags=()
2740+
two_word_flags=()
2741+
local_nonpersistent_flags=()
2742+
flags_with_completion=()
2743+
flags_completion=()
2744+
2745+
flags+=("--app-image=")
2746+
local_nonpersistent_flags+=("--app-image=")
2747+
flags+=("--app-name=")
2748+
local_nonpersistent_flags+=("--app-name=")
2749+
flags+=("--app-port=")
2750+
local_nonpersistent_flags+=("--app-port=")
2751+
flags+=("--cluster-context=")
2752+
local_nonpersistent_flags+=("--cluster-context=")
2753+
flags+=("--config=")
2754+
flags_with_completion+=("--config")
2755+
flags_completion+=("_filedir")
2756+
local_nonpersistent_flags+=("--config=")
2757+
flags+=("--context=")
2758+
local_nonpersistent_flags+=("--context=")
2759+
flags+=("--deploy-timeout=")
2760+
local_nonpersistent_flags+=("--deploy-timeout=")
2761+
flags+=("--diaglevel=")
2762+
two_word_flags+=("-l")
2763+
local_nonpersistent_flags+=("--diaglevel=")
2764+
flags+=("--http-retries=")
2765+
local_nonpersistent_flags+=("--http-retries=")
2766+
flags+=("--http-timeout=")
2767+
local_nonpersistent_flags+=("--http-timeout=")
2768+
flags+=("--keep-app")
2769+
local_nonpersistent_flags+=("--keep-app")
2770+
flags+=("--keep-project")
2771+
local_nonpersistent_flags+=("--keep-project")
2772+
flags+=("--loglevel=")
2773+
local_nonpersistent_flags+=("--loglevel=")
2774+
flags+=("--logspec=")
2775+
local_nonpersistent_flags+=("--logspec=")
2776+
flags+=("--node-selector=")
2777+
local_nonpersistent_flags+=("--node-selector=")
2778+
flags+=("--prevent-modification")
2779+
local_nonpersistent_flags+=("--prevent-modification")
2780+
flags+=("--project=")
2781+
local_nonpersistent_flags+=("--project=")
2782+
flags+=("--project-base=")
2783+
local_nonpersistent_flags+=("--project-base=")
2784+
flags+=("--result-dir=")
2785+
local_nonpersistent_flags+=("--result-dir=")
2786+
flags+=("--route-host=")
2787+
local_nonpersistent_flags+=("--route-host=")
2788+
flags+=("--route-port=")
2789+
local_nonpersistent_flags+=("--route-port=")
2790+
flags+=("--skip-route-connect")
2791+
local_nonpersistent_flags+=("--skip-route-connect")
2792+
flags+=("--skip-route-test")
2793+
local_nonpersistent_flags+=("--skip-route-test")
2794+
flags+=("--skip-service-connect")
2795+
local_nonpersistent_flags+=("--skip-service-connect")
2796+
flags+=("--v=")
2797+
local_nonpersistent_flags+=("--v=")
2798+
flags+=("--vmodule=")
2799+
local_nonpersistent_flags+=("--vmodule=")
2800+
flags+=("--as=")
2801+
flags+=("--as-group=")
2802+
flags+=("--cache-dir=")
2803+
flags+=("--certificate-authority=")
2804+
flags_with_completion+=("--certificate-authority")
2805+
flags_completion+=("_filedir")
2806+
flags+=("--client-certificate=")
2807+
flags_with_completion+=("--client-certificate")
2808+
flags_completion+=("_filedir")
2809+
flags+=("--client-key=")
2810+
flags_with_completion+=("--client-key")
2811+
flags_completion+=("_filedir")
2812+
flags+=("--cluster=")
2813+
flags+=("--insecure-skip-tls-verify")
2814+
flags+=("--log-flush-frequency=")
2815+
flags+=("--match-server-version")
2816+
flags+=("--namespace=")
2817+
two_word_flags+=("-n")
2818+
flags+=("--request-timeout=")
2819+
flags+=("--server=")
2820+
flags+=("--token=")
2821+
flags+=("--user=")
2822+
2823+
must_have_one_flag=()
2824+
must_have_one_noun=()
2825+
noun_aliases=()
2826+
}
2827+
27002828
_oc_adm_diagnostics_clusterregistry()
27012829
{
27022830
last_command="oc_adm_diagnostics_clusterregistry"
@@ -3692,6 +3820,7 @@ _oc_adm_diagnostics()
36923820
commands+=("aggregatedlogging")
36933821
commands+=("all")
36943822
commands+=("analyzelogs")
3823+
commands+=("appcreate")
36953824
commands+=("clusterregistry")
36963825
commands+=("clusterrolebindings")
36973826
commands+=("clusterroles")

‎docs/man/man1/.files_generated_oc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ oc-adm-create-signer-cert.1
4040
oc-adm-diagnostics-aggregatedlogging.1
4141
oc-adm-diagnostics-all.1
4242
oc-adm-diagnostics-analyzelogs.1
43+
oc-adm-diagnostics-appcreate.1
4344
oc-adm-diagnostics-clusterregistry.1
4445
oc-adm-diagnostics-clusterrolebindings.1
4546
oc-adm-diagnostics-clusterroles.1
@@ -193,6 +194,7 @@ oc-ex-config.1
193194
oc-ex-diagnostics-aggregatedlogging.1
194195
oc-ex-diagnostics-all.1
195196
oc-ex-diagnostics-analyzelogs.1
197+
oc-ex-diagnostics-appcreate.1
196198
oc-ex-diagnostics-clusterregistry.1
197199
oc-ex-diagnostics-clusterrolebindings.1
198200
oc-ex-diagnostics-clusterroles.1

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
This file is autogenerated, but we've stopped checking such files into the
2+
repository to reduce the need for rebases. Please run hack/generate-docs.sh to
3+
populate this file.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
This file is autogenerated, but we've stopped checking such files into the
2+
repository to reduce the need for rebases. Please run hack/generate-docs.sh to
3+
populate this file.

‎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)