Skip to content

Commit

Permalink
diagnostics: introduce AppCreate
Browse files Browse the repository at this point in the history
  • Loading branch information
@sosiouxme
sosiouxme committed Jan 10, 2018
1 parent 09fd06d commit 6d82a45
Show file tree
Hide file tree
Showing 23 changed files with 1,312 additions and 38 deletions.
133 changes: 133 additions & 0 deletions contrib/completions/bash/oc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2424,6 +2424,42 @@ _oc_adm_diagnostics_all()
flags_with_completion=()
flags_completion=()

flags+=("--appcreate-admission-timeout=")
local_nonpersistent_flags+=("--appcreate-admission-timeout=")
flags+=("--appcreate-app-image=")
local_nonpersistent_flags+=("--appcreate-app-image=")
flags+=("--appcreate-app-name=")
local_nonpersistent_flags+=("--appcreate-app-name=")
flags+=("--appcreate-app-port=")
local_nonpersistent_flags+=("--appcreate-app-port=")
flags+=("--appcreate-deploy-timeout=")
local_nonpersistent_flags+=("--appcreate-deploy-timeout=")
flags+=("--appcreate-http-retries=")
local_nonpersistent_flags+=("--appcreate-http-retries=")
flags+=("--appcreate-http-timeout=")
local_nonpersistent_flags+=("--appcreate-http-timeout=")
flags+=("--appcreate-keep-app")
local_nonpersistent_flags+=("--appcreate-keep-app")
flags+=("--appcreate-keep-project")
local_nonpersistent_flags+=("--appcreate-keep-project")
flags+=("--appcreate-node-selector=")
local_nonpersistent_flags+=("--appcreate-node-selector=")
flags+=("--appcreate-project=")
local_nonpersistent_flags+=("--appcreate-project=")
flags+=("--appcreate-project-base=")
local_nonpersistent_flags+=("--appcreate-project-base=")
flags+=("--appcreate-result-dir=")
local_nonpersistent_flags+=("--appcreate-result-dir=")
flags+=("--appcreate-route-host=")
local_nonpersistent_flags+=("--appcreate-route-host=")
flags+=("--appcreate-route-port=")
local_nonpersistent_flags+=("--appcreate-route-port=")
flags+=("--appcreate-skip-route-connect")
local_nonpersistent_flags+=("--appcreate-skip-route-connect")
flags+=("--appcreate-skip-route-test")
local_nonpersistent_flags+=("--appcreate-skip-route-test")
flags+=("--appcreate-skip-service-connect")
local_nonpersistent_flags+=("--appcreate-skip-service-connect")
flags+=("--cluster-context=")
local_nonpersistent_flags+=("--cluster-context=")
flags+=("--config=")
Expand Down Expand Up @@ -2555,6 +2591,102 @@ _oc_adm_diagnostics_analyzelogs()
noun_aliases=()
}

_oc_adm_diagnostics_appcreate()
{
last_command="oc_adm_diagnostics_appcreate"
commands=()

flags=()
two_word_flags=()
local_nonpersistent_flags=()
flags_with_completion=()
flags_completion=()

flags+=("--admission-timeout=")
local_nonpersistent_flags+=("--admission-timeout=")
flags+=("--app-image=")
local_nonpersistent_flags+=("--app-image=")
flags+=("--app-name=")
local_nonpersistent_flags+=("--app-name=")
flags+=("--app-port=")
local_nonpersistent_flags+=("--app-port=")
flags+=("--cluster-context=")
local_nonpersistent_flags+=("--cluster-context=")
flags+=("--config=")
flags_with_completion+=("--config")
flags_completion+=("_filedir")
local_nonpersistent_flags+=("--config=")
flags+=("--context=")
local_nonpersistent_flags+=("--context=")
flags+=("--deploy-timeout=")
local_nonpersistent_flags+=("--deploy-timeout=")
flags+=("--diaglevel=")
two_word_flags+=("-l")
local_nonpersistent_flags+=("--diaglevel=")
flags+=("--http-retries=")
local_nonpersistent_flags+=("--http-retries=")
flags+=("--http-timeout=")
local_nonpersistent_flags+=("--http-timeout=")
flags+=("--keep-app")
local_nonpersistent_flags+=("--keep-app")
flags+=("--keep-project")
local_nonpersistent_flags+=("--keep-project")
flags+=("--loglevel=")
local_nonpersistent_flags+=("--loglevel=")
flags+=("--logspec=")
local_nonpersistent_flags+=("--logspec=")
flags+=("--node-selector=")
local_nonpersistent_flags+=("--node-selector=")
flags+=("--prevent-modification")
local_nonpersistent_flags+=("--prevent-modification")
flags+=("--project=")
local_nonpersistent_flags+=("--project=")
flags+=("--project-base=")
local_nonpersistent_flags+=("--project-base=")
flags+=("--result-dir=")
local_nonpersistent_flags+=("--result-dir=")
flags+=("--route-host=")
local_nonpersistent_flags+=("--route-host=")
flags+=("--route-port=")
local_nonpersistent_flags+=("--route-port=")
flags+=("--skip-route-connect")
local_nonpersistent_flags+=("--skip-route-connect")
flags+=("--skip-route-test")
local_nonpersistent_flags+=("--skip-route-test")
flags+=("--skip-service-connect")
local_nonpersistent_flags+=("--skip-service-connect")
flags+=("--v=")
local_nonpersistent_flags+=("--v=")
flags+=("--vmodule=")
local_nonpersistent_flags+=("--vmodule=")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--cache-dir=")
flags+=("--certificate-authority=")
flags_with_completion+=("--certificate-authority")
flags_completion+=("_filedir")
flags+=("--client-certificate=")
flags_with_completion+=("--client-certificate")
flags_completion+=("_filedir")
flags+=("--client-key=")
flags_with_completion+=("--client-key")
flags_completion+=("_filedir")
flags+=("--cluster=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--request-timeout=")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_noun=()
noun_aliases=()
}

_oc_adm_diagnostics_clusterregistry()
{
last_command="oc_adm_diagnostics_clusterregistry"
Expand Down Expand Up @@ -3550,6 +3682,7 @@ _oc_adm_diagnostics()
commands+=("aggregatedlogging")
commands+=("all")
commands+=("analyzelogs")
commands+=("appcreate")
commands+=("clusterregistry")
commands+=("clusterrolebindings")
commands+=("clusterroles")
Expand Down
133 changes: 133 additions & 0 deletions contrib/completions/zsh/oc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2566,6 +2566,42 @@ _oc_adm_diagnostics_all()
flags_with_completion=()
flags_completion=()

flags+=("--appcreate-admission-timeout=")
local_nonpersistent_flags+=("--appcreate-admission-timeout=")
flags+=("--appcreate-app-image=")
local_nonpersistent_flags+=("--appcreate-app-image=")
flags+=("--appcreate-app-name=")
local_nonpersistent_flags+=("--appcreate-app-name=")
flags+=("--appcreate-app-port=")
local_nonpersistent_flags+=("--appcreate-app-port=")
flags+=("--appcreate-deploy-timeout=")
local_nonpersistent_flags+=("--appcreate-deploy-timeout=")
flags+=("--appcreate-http-retries=")
local_nonpersistent_flags+=("--appcreate-http-retries=")
flags+=("--appcreate-http-timeout=")
local_nonpersistent_flags+=("--appcreate-http-timeout=")
flags+=("--appcreate-keep-app")
local_nonpersistent_flags+=("--appcreate-keep-app")
flags+=("--appcreate-keep-project")
local_nonpersistent_flags+=("--appcreate-keep-project")
flags+=("--appcreate-node-selector=")
local_nonpersistent_flags+=("--appcreate-node-selector=")
flags+=("--appcreate-project=")
local_nonpersistent_flags+=("--appcreate-project=")
flags+=("--appcreate-project-base=")
local_nonpersistent_flags+=("--appcreate-project-base=")
flags+=("--appcreate-result-dir=")
local_nonpersistent_flags+=("--appcreate-result-dir=")
flags+=("--appcreate-route-host=")
local_nonpersistent_flags+=("--appcreate-route-host=")
flags+=("--appcreate-route-port=")
local_nonpersistent_flags+=("--appcreate-route-port=")
flags+=("--appcreate-skip-route-connect")
local_nonpersistent_flags+=("--appcreate-skip-route-connect")
flags+=("--appcreate-skip-route-test")
local_nonpersistent_flags+=("--appcreate-skip-route-test")
flags+=("--appcreate-skip-service-connect")
local_nonpersistent_flags+=("--appcreate-skip-service-connect")
flags+=("--cluster-context=")
local_nonpersistent_flags+=("--cluster-context=")
flags+=("--config=")
Expand Down Expand Up @@ -2697,6 +2733,102 @@ _oc_adm_diagnostics_analyzelogs()
noun_aliases=()
}

_oc_adm_diagnostics_appcreate()
{
last_command="oc_adm_diagnostics_appcreate"
commands=()

flags=()
two_word_flags=()
local_nonpersistent_flags=()
flags_with_completion=()
flags_completion=()

flags+=("--admission-timeout=")
local_nonpersistent_flags+=("--admission-timeout=")
flags+=("--app-image=")
local_nonpersistent_flags+=("--app-image=")
flags+=("--app-name=")
local_nonpersistent_flags+=("--app-name=")
flags+=("--app-port=")
local_nonpersistent_flags+=("--app-port=")
flags+=("--cluster-context=")
local_nonpersistent_flags+=("--cluster-context=")
flags+=("--config=")
flags_with_completion+=("--config")
flags_completion+=("_filedir")
local_nonpersistent_flags+=("--config=")
flags+=("--context=")
local_nonpersistent_flags+=("--context=")
flags+=("--deploy-timeout=")
local_nonpersistent_flags+=("--deploy-timeout=")
flags+=("--diaglevel=")
two_word_flags+=("-l")
local_nonpersistent_flags+=("--diaglevel=")
flags+=("--http-retries=")
local_nonpersistent_flags+=("--http-retries=")
flags+=("--http-timeout=")
local_nonpersistent_flags+=("--http-timeout=")
flags+=("--keep-app")
local_nonpersistent_flags+=("--keep-app")
flags+=("--keep-project")
local_nonpersistent_flags+=("--keep-project")
flags+=("--loglevel=")
local_nonpersistent_flags+=("--loglevel=")
flags+=("--logspec=")
local_nonpersistent_flags+=("--logspec=")
flags+=("--node-selector=")
local_nonpersistent_flags+=("--node-selector=")
flags+=("--prevent-modification")
local_nonpersistent_flags+=("--prevent-modification")
flags+=("--project=")
local_nonpersistent_flags+=("--project=")
flags+=("--project-base=")
local_nonpersistent_flags+=("--project-base=")
flags+=("--result-dir=")
local_nonpersistent_flags+=("--result-dir=")
flags+=("--route-host=")
local_nonpersistent_flags+=("--route-host=")
flags+=("--route-port=")
local_nonpersistent_flags+=("--route-port=")
flags+=("--skip-route-connect")
local_nonpersistent_flags+=("--skip-route-connect")
flags+=("--skip-route-test")
local_nonpersistent_flags+=("--skip-route-test")
flags+=("--skip-service-connect")
local_nonpersistent_flags+=("--skip-service-connect")
flags+=("--v=")
local_nonpersistent_flags+=("--v=")
flags+=("--vmodule=")
local_nonpersistent_flags+=("--vmodule=")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--cache-dir=")
flags+=("--certificate-authority=")
flags_with_completion+=("--certificate-authority")
flags_completion+=("_filedir")
flags+=("--client-certificate=")
flags_with_completion+=("--client-certificate")
flags_completion+=("_filedir")
flags+=("--client-key=")
flags_with_completion+=("--client-key")
flags_completion+=("_filedir")
flags+=("--cluster=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--request-timeout=")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_noun=()
noun_aliases=()
}

_oc_adm_diagnostics_clusterregistry()
{
last_command="oc_adm_diagnostics_clusterregistry"
Expand Down Expand Up @@ -3692,6 +3824,7 @@ _oc_adm_diagnostics()
commands+=("aggregatedlogging")
commands+=("all")
commands+=("analyzelogs")
commands+=("appcreate")
commands+=("clusterregistry")
commands+=("clusterrolebindings")
commands+=("clusterroles")
Expand Down
2 changes: 2 additions & 0 deletions docs/man/man1/.files_generated_oc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ oc-adm-create-signer-cert.1
oc-adm-diagnostics-aggregatedlogging.1
oc-adm-diagnostics-all.1
oc-adm-diagnostics-analyzelogs.1
oc-adm-diagnostics-appcreate.1
oc-adm-diagnostics-clusterregistry.1
oc-adm-diagnostics-clusterrolebindings.1
oc-adm-diagnostics-clusterroles.1
Expand Down Expand Up @@ -193,6 +194,7 @@ oc-ex-config.1
oc-ex-diagnostics-aggregatedlogging.1
oc-ex-diagnostics-all.1
oc-ex-diagnostics-analyzelogs.1
oc-ex-diagnostics-appcreate.1
oc-ex-diagnostics-clusterregistry.1
oc-ex-diagnostics-clusterrolebindings.1
oc-ex-diagnostics-clusterroles.1
Expand Down
3 changes: 3 additions & 0 deletions docs/man/man1/oc-adm-diagnostics-appcreate.1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This file is autogenerated, but we've stopped checking such files into the
repository to reduce the need for rebases. Please run hack/generate-docs.sh to
populate this file.
3 changes: 3 additions & 0 deletions docs/man/man1/oc-ex-diagnostics-appcreate.1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This file is autogenerated, but we've stopped checking such files into the
repository to reduce the need for rebases. Please run hack/generate-docs.sh to
populate this file.
12 changes: 12 additions & 0 deletions pkg/oc/admin/diagnostics/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset"
clustdiags "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/cluster"
agldiags "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/cluster/aggregated_logging"
appcreate "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/cluster/app_create"
"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
osclientcmd "github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
projectclient "github.com/openshift/origin/pkg/project/generated/internalclientset"
Expand All @@ -30,6 +31,7 @@ import (
func availableClusterDiagnostics() types.DiagnosticList {
return types.DiagnosticList{
&agldiags.AggregatedLogging{},
appcreate.NewDefaultAppCreateDiagnostic(),
&clustdiags.ClusterRegistry{},
&clustdiags.ClusterRouter{},
&clustdiags.ClusterRoles{},
Expand Down Expand Up @@ -95,6 +97,16 @@ func (o DiagnosticsOptions) buildClusterDiagnostics(rawConfig *clientcmdapi.Conf
switch diagnosticName {
case agldiags.AggregatedLoggingName:
d = agldiags.NewAggregatedLogging(o.MasterConfigLocation, kclusterClient, oauthClient.Oauth(), projectClient.Project(), routeClient.Route(), oauthorizationClient.Authorization(), appsClient.Apps(), securityClient.Security())
case appcreate.AppCreateName:
ac := o.ParameterizedDiagnostics[diagnosticName].(*appcreate.AppCreate)
ac.KubeClient = kclusterClient
ac.ProjectClient = projectClient.Project()
ac.RouteClient = routeClient
ac.RoleBindingClient = oauthorizationClient.Authorization()
ac.SARClient = kclusterClient.Authorization()
ac.AppsClient = appsClient
ac.PreventModification = o.PreventModification
d = ac
case clustdiags.NodeDefinitionsName:
d = &clustdiags.NodeDefinitions{KubeClient: kclusterClient}
case clustdiags.MasterNodeName:
Expand Down
2 changes: 2 additions & 0 deletions pkg/oc/admin/diagnostics/diagnostics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ func bindIndividualFlags(diag types.ParameterizedDiagnostic, prefix string, flag
flags.StringVar(target, name, param.Default.(string), param.Description)
case *int:
flags.IntVar(target, name, param.Default.(int), param.Description)
case *int64:
flags.Int64Var(target, name, param.Default.(int64), param.Description)
case *bool:
flags.BoolVar(target, name, param.Default.(bool), param.Description)
default:
Expand Down
Loading

0 comments on commit 6d82a45

Please sign in to comment.