diff --git a/contrib/completions/bash/oc b/contrib/completions/bash/oc index 567611949a76..214155efd1f6 100644 --- a/contrib/completions/bash/oc +++ b/contrib/completions/bash/oc @@ -855,6 +855,8 @@ _oc_adm_certificate_approve() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -870,6 +872,10 @@ _oc_adm_certificate_approve() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -911,6 +917,8 @@ _oc_adm_certificate_deny() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -926,6 +934,10 @@ _oc_adm_certificate_deny() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -6128,6 +6140,8 @@ _oc_adm_taint() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--output=") two_word_flags+=("-o") local_nonpersistent_flags+=("--output=") @@ -6136,6 +6150,10 @@ _oc_adm_taint() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--validate") local_nonpersistent_flags+=("--validate") flags+=("--as=") @@ -6588,6 +6606,8 @@ _oc_annotate() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--field-selector=") @@ -6618,6 +6638,10 @@ _oc_annotate() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -6814,6 +6838,8 @@ _oc_apply_set-last-applied() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--create-annotation") local_nonpersistent_flags+=("--create-annotation") flags+=("--dry-run") @@ -6828,6 +6854,10 @@ _oc_apply_set-last-applied() flags+=("--output=") two_word_flags+=("-o") local_nonpersistent_flags+=("--output=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -6933,6 +6963,8 @@ _oc_apply() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--cascade") local_nonpersistent_flags+=("--cascade") flags+=("--dry-run") @@ -6969,6 +7001,10 @@ _oc_apply() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout=") local_nonpersistent_flags+=("--timeout=") flags+=("--validate") @@ -7118,6 +7154,8 @@ _oc_auth_reconcile() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--filename=") @@ -7133,6 +7171,10 @@ _oc_auth_reconcile() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -7219,6 +7261,8 @@ _oc_autoscale() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--cpu-percent=") local_nonpersistent_flags+=("--cpu-percent=") flags+=("--dry-run") @@ -7248,6 +7292,10 @@ _oc_autoscale() local_nonpersistent_flags+=("--recursive") flags+=("--save-config") local_nonpersistent_flags+=("--save-config") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -8249,6 +8297,8 @@ _oc_convert() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -8266,6 +8316,10 @@ _oc_convert() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--validate") local_nonpersistent_flags+=("--validate") flags+=("--as=") @@ -10410,6 +10464,8 @@ _oc_debug() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--as-root") local_nonpersistent_flags+=("--as-root") flags+=("--as-user=") @@ -10417,12 +10473,14 @@ _oc_debug() flags+=("--container=") two_word_flags+=("-c") local_nonpersistent_flags+=("--container=") + flags+=("--dry-run") + local_nonpersistent_flags+=("--dry-run") flags+=("--filename=") flags_with_completion+=("--filename") - flags_completion+=("__oc_handle_filename_extension_flag yaml|yml|json") + flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") two_word_flags+=("-f") flags_with_completion+=("-f") - flags_completion+=("__oc_handle_filename_extension_flag yaml|yml|json") + flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") local_nonpersistent_flags+=("--filename=") flags+=("--keep-annotations") local_nonpersistent_flags+=("--keep-annotations") @@ -10445,8 +10503,9 @@ _oc_debug() flags+=("--output=") two_word_flags+=("-o") local_nonpersistent_flags+=("--output=") - flags+=("--output-version=") - local_nonpersistent_flags+=("--output-version=") + flags+=("--recursive") + flags+=("-R") + local_nonpersistent_flags+=("--recursive") flags+=("--show-labels") local_nonpersistent_flags+=("--show-labels") flags+=("--template=") @@ -10634,6 +10693,8 @@ _oc_edit() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -10655,6 +10716,10 @@ _oc_edit() local_nonpersistent_flags+=("--recursive") flags+=("--save-config") local_nonpersistent_flags+=("--save-config") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--validate") local_nonpersistent_flags+=("--validate") flags+=("--windows-line-endings") @@ -11315,6 +11380,8 @@ _oc_expose() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--cluster-ip=") local_nonpersistent_flags+=("--cluster-ip=") flags+=("--dry-run") @@ -11363,6 +11430,10 @@ _oc_expose() local_nonpersistent_flags+=("--session-affinity=") flags+=("--target-port=") local_nonpersistent_flags+=("--target-port=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--type=") local_nonpersistent_flags+=("--type=") flags+=("--wildcard-policy=") @@ -11910,6 +11981,8 @@ _oc_label() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--field-selector=") @@ -11942,6 +12015,10 @@ _oc_label() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -12540,6 +12617,8 @@ _oc_patch() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--filename=") @@ -12562,6 +12641,10 @@ _oc_patch() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--type=") local_nonpersistent_flags+=("--type=") flags+=("--as=") @@ -13677,6 +13760,8 @@ _oc_replace() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--cascade") local_nonpersistent_flags+=("--cascade") flags+=("--filename=") @@ -13698,6 +13783,10 @@ _oc_replace() local_nonpersistent_flags+=("--recursive") flags+=("--save-config") local_nonpersistent_flags+=("--save-config") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout=") local_nonpersistent_flags+=("--timeout=") flags+=("--validate") @@ -13814,6 +13903,8 @@ _oc_rollout_cancel() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -13827,6 +13918,10 @@ _oc_rollout_cancel() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -13928,11 +14023,17 @@ _oc_rollout_latest() flags+=("--again") local_nonpersistent_flags+=("--again") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--output=") two_word_flags+=("-o") local_nonpersistent_flags+=("--output=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -14080,6 +14181,8 @@ _oc_rollout_retry() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -14093,6 +14196,10 @@ _oc_rollout_retry() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -14419,6 +14526,8 @@ _oc_run() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--attach") local_nonpersistent_flags+=("--attach") flags+=("--cascade") @@ -14495,6 +14604,10 @@ _oc_run() flags+=("--stdin") flags+=("-i") local_nonpersistent_flags+=("--stdin") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout=") local_nonpersistent_flags+=("--timeout=") flags+=("--tty") @@ -14546,6 +14659,8 @@ _oc_scale() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--current-replicas=") local_nonpersistent_flags+=("--current-replicas=") flags+=("--filename=") @@ -14570,6 +14685,10 @@ _oc_scale() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout=") local_nonpersistent_flags+=("--timeout=") flags+=("--as=") @@ -14966,6 +15085,8 @@ _oc_set_build-hook() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--command") local_nonpersistent_flags+=("--command") flags+=("--dry-run") @@ -14994,6 +15115,10 @@ _oc_set_build-hook() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15037,6 +15162,8 @@ _oc_set_build-secret() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--filename=") @@ -15065,6 +15192,10 @@ _oc_set_build-secret() local_nonpersistent_flags+=("--selector=") flags+=("--source") local_nonpersistent_flags+=("--source") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15108,6 +15239,8 @@ _oc_set_deployment-hook() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--container=") two_word_flags+=("-c") local_nonpersistent_flags+=("--container=") @@ -15144,6 +15277,10 @@ _oc_set_deployment-hook() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--volumes=") local_nonpersistent_flags+=("--volumes=") flags+=("--as=") @@ -15189,6 +15326,8 @@ _oc_set_env() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--containers=") two_word_flags+=("-c") local_nonpersistent_flags+=("--containers=") @@ -15227,6 +15366,10 @@ _oc_set_env() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15270,6 +15413,8 @@ _oc_set_image() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--filename=") @@ -15296,6 +15441,10 @@ _oc_set_image() local_nonpersistent_flags+=("--selector=") flags+=("--source=") local_nonpersistent_flags+=("--source=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15339,6 +15488,8 @@ _oc_set_image-lookup() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--enabled") @@ -15363,6 +15514,10 @@ _oc_set_image-lookup() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15406,6 +15561,8 @@ _oc_set_probe() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--containers=") two_word_flags+=("-c") local_nonpersistent_flags+=("--containers=") @@ -15447,6 +15604,10 @@ _oc_set_probe() local_nonpersistent_flags+=("--selector=") flags+=("--success-threshold=") local_nonpersistent_flags+=("--success-threshold=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout-seconds=") local_nonpersistent_flags+=("--timeout-seconds=") flags+=("--as=") @@ -15492,6 +15653,8 @@ _oc_set_resources() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--containers=") two_word_flags+=("-c") local_nonpersistent_flags+=("--containers=") @@ -15523,6 +15686,10 @@ _oc_set_resources() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15568,6 +15735,8 @@ _oc_set_route-backends() local_nonpersistent_flags+=("--adjust") flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--equal") @@ -15590,6 +15759,10 @@ _oc_set_route-backends() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--zero") local_nonpersistent_flags+=("--zero") flags+=("--as=") @@ -15635,6 +15808,8 @@ _oc_set_triggers() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--auto") local_nonpersistent_flags+=("--auto") flags+=("--containers=") @@ -15680,6 +15855,10 @@ _oc_set_triggers() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15725,6 +15904,8 @@ _oc_set_volumes() local_nonpersistent_flags+=("--add") flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--claim-class=") local_nonpersistent_flags+=("--claim-class=") flags+=("--claim-mode=") @@ -15781,6 +15962,10 @@ _oc_set_volumes() local_nonpersistent_flags+=("--source=") flags+=("--sub-path=") local_nonpersistent_flags+=("--sub-path=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--type=") two_word_flags+=("-t") local_nonpersistent_flags+=("--type=") @@ -16146,6 +16331,8 @@ _oc_wait() flags+=("--all-namespaces") local_nonpersistent_flags+=("--all-namespaces") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -16164,6 +16351,10 @@ _oc_wait() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout=") local_nonpersistent_flags+=("--timeout=") flags+=("--as=") diff --git a/contrib/completions/zsh/oc b/contrib/completions/zsh/oc index 041c7835aee1..7af48c050c25 100644 --- a/contrib/completions/zsh/oc +++ b/contrib/completions/zsh/oc @@ -997,6 +997,8 @@ _oc_adm_certificate_approve() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -1012,6 +1014,10 @@ _oc_adm_certificate_approve() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -1053,6 +1059,8 @@ _oc_adm_certificate_deny() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -1068,6 +1076,10 @@ _oc_adm_certificate_deny() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -6270,6 +6282,8 @@ _oc_adm_taint() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--output=") two_word_flags+=("-o") local_nonpersistent_flags+=("--output=") @@ -6278,6 +6292,10 @@ _oc_adm_taint() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--validate") local_nonpersistent_flags+=("--validate") flags+=("--as=") @@ -6730,6 +6748,8 @@ _oc_annotate() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--field-selector=") @@ -6760,6 +6780,10 @@ _oc_annotate() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -6956,6 +6980,8 @@ _oc_apply_set-last-applied() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--create-annotation") local_nonpersistent_flags+=("--create-annotation") flags+=("--dry-run") @@ -6970,6 +6996,10 @@ _oc_apply_set-last-applied() flags+=("--output=") two_word_flags+=("-o") local_nonpersistent_flags+=("--output=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -7075,6 +7105,8 @@ _oc_apply() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--cascade") local_nonpersistent_flags+=("--cascade") flags+=("--dry-run") @@ -7111,6 +7143,10 @@ _oc_apply() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout=") local_nonpersistent_flags+=("--timeout=") flags+=("--validate") @@ -7260,6 +7296,8 @@ _oc_auth_reconcile() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--filename=") @@ -7275,6 +7313,10 @@ _oc_auth_reconcile() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -7361,6 +7403,8 @@ _oc_autoscale() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--cpu-percent=") local_nonpersistent_flags+=("--cpu-percent=") flags+=("--dry-run") @@ -7390,6 +7434,10 @@ _oc_autoscale() local_nonpersistent_flags+=("--recursive") flags+=("--save-config") local_nonpersistent_flags+=("--save-config") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -8391,6 +8439,8 @@ _oc_convert() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -8408,6 +8458,10 @@ _oc_convert() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--validate") local_nonpersistent_flags+=("--validate") flags+=("--as=") @@ -10552,6 +10606,8 @@ _oc_debug() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--as-root") local_nonpersistent_flags+=("--as-root") flags+=("--as-user=") @@ -10559,12 +10615,14 @@ _oc_debug() flags+=("--container=") two_word_flags+=("-c") local_nonpersistent_flags+=("--container=") + flags+=("--dry-run") + local_nonpersistent_flags+=("--dry-run") flags+=("--filename=") flags_with_completion+=("--filename") - flags_completion+=("__oc_handle_filename_extension_flag yaml|yml|json") + flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") two_word_flags+=("-f") flags_with_completion+=("-f") - flags_completion+=("__oc_handle_filename_extension_flag yaml|yml|json") + flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") local_nonpersistent_flags+=("--filename=") flags+=("--keep-annotations") local_nonpersistent_flags+=("--keep-annotations") @@ -10587,8 +10645,9 @@ _oc_debug() flags+=("--output=") two_word_flags+=("-o") local_nonpersistent_flags+=("--output=") - flags+=("--output-version=") - local_nonpersistent_flags+=("--output-version=") + flags+=("--recursive") + flags+=("-R") + local_nonpersistent_flags+=("--recursive") flags+=("--show-labels") local_nonpersistent_flags+=("--show-labels") flags+=("--template=") @@ -10776,6 +10835,8 @@ _oc_edit() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -10797,6 +10858,10 @@ _oc_edit() local_nonpersistent_flags+=("--recursive") flags+=("--save-config") local_nonpersistent_flags+=("--save-config") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--validate") local_nonpersistent_flags+=("--validate") flags+=("--windows-line-endings") @@ -11457,6 +11522,8 @@ _oc_expose() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--cluster-ip=") local_nonpersistent_flags+=("--cluster-ip=") flags+=("--dry-run") @@ -11505,6 +11572,10 @@ _oc_expose() local_nonpersistent_flags+=("--session-affinity=") flags+=("--target-port=") local_nonpersistent_flags+=("--target-port=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--type=") local_nonpersistent_flags+=("--type=") flags+=("--wildcard-policy=") @@ -12052,6 +12123,8 @@ _oc_label() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--field-selector=") @@ -12084,6 +12157,10 @@ _oc_label() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -12682,6 +12759,8 @@ _oc_patch() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--filename=") @@ -12704,6 +12783,10 @@ _oc_patch() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--type=") local_nonpersistent_flags+=("--type=") flags+=("--as=") @@ -13819,6 +13902,8 @@ _oc_replace() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--cascade") local_nonpersistent_flags+=("--cascade") flags+=("--filename=") @@ -13840,6 +13925,10 @@ _oc_replace() local_nonpersistent_flags+=("--recursive") flags+=("--save-config") local_nonpersistent_flags+=("--save-config") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout=") local_nonpersistent_flags+=("--timeout=") flags+=("--validate") @@ -13956,6 +14045,8 @@ _oc_rollout_cancel() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -13969,6 +14060,10 @@ _oc_rollout_cancel() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -14070,11 +14165,17 @@ _oc_rollout_latest() flags+=("--again") local_nonpersistent_flags+=("--again") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--output=") two_word_flags+=("-o") local_nonpersistent_flags+=("--output=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -14222,6 +14323,8 @@ _oc_rollout_retry() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -14235,6 +14338,10 @@ _oc_rollout_retry() flags+=("--recursive") flags+=("-R") local_nonpersistent_flags+=("--recursive") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -14561,6 +14668,8 @@ _oc_run() flags_with_completion=() flags_completion=() + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--attach") local_nonpersistent_flags+=("--attach") flags+=("--cascade") @@ -14637,6 +14746,10 @@ _oc_run() flags+=("--stdin") flags+=("-i") local_nonpersistent_flags+=("--stdin") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout=") local_nonpersistent_flags+=("--timeout=") flags+=("--tty") @@ -14688,6 +14801,8 @@ _oc_scale() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--current-replicas=") local_nonpersistent_flags+=("--current-replicas=") flags+=("--filename=") @@ -14712,6 +14827,10 @@ _oc_scale() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout=") local_nonpersistent_flags+=("--timeout=") flags+=("--as=") @@ -15108,6 +15227,8 @@ _oc_set_build-hook() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--command") local_nonpersistent_flags+=("--command") flags+=("--dry-run") @@ -15136,6 +15257,10 @@ _oc_set_build-hook() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15179,6 +15304,8 @@ _oc_set_build-secret() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--filename=") @@ -15207,6 +15334,10 @@ _oc_set_build-secret() local_nonpersistent_flags+=("--selector=") flags+=("--source") local_nonpersistent_flags+=("--source") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15250,6 +15381,8 @@ _oc_set_deployment-hook() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--container=") two_word_flags+=("-c") local_nonpersistent_flags+=("--container=") @@ -15286,6 +15419,10 @@ _oc_set_deployment-hook() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--volumes=") local_nonpersistent_flags+=("--volumes=") flags+=("--as=") @@ -15331,6 +15468,8 @@ _oc_set_env() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--containers=") two_word_flags+=("-c") local_nonpersistent_flags+=("--containers=") @@ -15369,6 +15508,10 @@ _oc_set_env() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15412,6 +15555,8 @@ _oc_set_image() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--filename=") @@ -15438,6 +15583,10 @@ _oc_set_image() local_nonpersistent_flags+=("--selector=") flags+=("--source=") local_nonpersistent_flags+=("--source=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15481,6 +15630,8 @@ _oc_set_image-lookup() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--enabled") @@ -15505,6 +15656,10 @@ _oc_set_image-lookup() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15548,6 +15703,8 @@ _oc_set_probe() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--containers=") two_word_flags+=("-c") local_nonpersistent_flags+=("--containers=") @@ -15589,6 +15746,10 @@ _oc_set_probe() local_nonpersistent_flags+=("--selector=") flags+=("--success-threshold=") local_nonpersistent_flags+=("--success-threshold=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout-seconds=") local_nonpersistent_flags+=("--timeout-seconds=") flags+=("--as=") @@ -15634,6 +15795,8 @@ _oc_set_resources() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--containers=") two_word_flags+=("-c") local_nonpersistent_flags+=("--containers=") @@ -15665,6 +15828,10 @@ _oc_set_resources() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15710,6 +15877,8 @@ _oc_set_route-backends() local_nonpersistent_flags+=("--adjust") flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--dry-run") local_nonpersistent_flags+=("--dry-run") flags+=("--equal") @@ -15732,6 +15901,10 @@ _oc_set_route-backends() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--zero") local_nonpersistent_flags+=("--zero") flags+=("--as=") @@ -15777,6 +15950,8 @@ _oc_set_triggers() flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--auto") local_nonpersistent_flags+=("--auto") flags+=("--containers=") @@ -15822,6 +15997,10 @@ _oc_set_triggers() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--as=") flags+=("--as-group=") flags+=("--cache-dir=") @@ -15867,6 +16046,8 @@ _oc_set_volumes() local_nonpersistent_flags+=("--add") flags+=("--all") local_nonpersistent_flags+=("--all") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--claim-class=") local_nonpersistent_flags+=("--claim-class=") flags+=("--claim-mode=") @@ -15923,6 +16104,10 @@ _oc_set_volumes() local_nonpersistent_flags+=("--source=") flags+=("--sub-path=") local_nonpersistent_flags+=("--sub-path=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--type=") two_word_flags+=("-t") local_nonpersistent_flags+=("--type=") @@ -16288,6 +16473,8 @@ _oc_wait() flags+=("--all-namespaces") local_nonpersistent_flags+=("--all-namespaces") + flags+=("--allow-missing-template-keys") + local_nonpersistent_flags+=("--allow-missing-template-keys") flags+=("--filename=") flags_with_completion+=("--filename") flags_completion+=("__oc_handle_filename_extension_flag json|yaml|yml") @@ -16306,6 +16493,10 @@ _oc_wait() flags+=("--selector=") two_word_flags+=("-l") local_nonpersistent_flags+=("--selector=") + flags+=("--template=") + flags_with_completion+=("--template") + flags_completion+=("_filedir") + local_nonpersistent_flags+=("--template=") flags+=("--timeout=") local_nonpersistent_flags+=("--timeout=") flags+=("--as=") diff --git a/docs/generated/.files_generated b/docs/generated/.files_generated index beb8b8fac433..e69de29bb2d1 100644 --- a/docs/generated/.files_generated +++ b/docs/generated/.files_generated @@ -1 +0,0 @@ -oc_by_example_content.adoc diff --git a/docs/generated/oc_by_example_content.adoc b/docs/generated/oc_by_example_content.adoc deleted file mode 100644 index b6fd7a0f9896..000000000000 --- a/docs/generated/oc_by_example_content.adoc +++ /dev/null @@ -1,3 +0,0 @@ -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. diff --git a/pkg/oc/cli/cmd/create/create.go b/pkg/oc/cli/cmd/create/create.go index 26e8fdcc8bd8..5713a708f170 100644 --- a/pkg/oc/cli/cmd/create/create.go +++ b/pkg/oc/cli/cmd/create/create.go @@ -5,8 +5,7 @@ import ( "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/api/legacyscheme" - "k8s.io/kubernetes/pkg/kubectl/cmd/create" + "github.com/openshift/origin/pkg/oc/util/ocscheme" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/genericclioptions" "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" @@ -17,7 +16,7 @@ type CreateSubcommandOptions struct { genericclioptions.IOStreams // PrintFlags holds options necessary for obtaining a printer - PrintFlags *create.PrintFlags + PrintFlags *genericclioptions.PrintFlags // Name of resource being created Name string // DryRun is true if the command should be simulated but not run against the server @@ -31,7 +30,7 @@ type CreateSubcommandOptions struct { func NewCreateSubcommandOptions(ioStreams genericclioptions.IOStreams) *CreateSubcommandOptions { return &CreateSubcommandOptions{ - PrintFlags: create.NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(ocscheme.PrintingInternalScheme), IOStreams: ioStreams, } } diff --git a/pkg/oc/cli/cmd/create/route.go b/pkg/oc/cli/cmd/create/route.go index aa96707c92f1..f93ac083d897 100644 --- a/pkg/oc/cli/cmd/create/route.go +++ b/pkg/oc/cli/cmd/create/route.go @@ -6,15 +6,14 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/legacyscheme" kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/kubectl/cmd/create" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/genericclioptions" "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1" + "github.com/openshift/origin/pkg/oc/util/ocscheme" ) var ( @@ -44,7 +43,7 @@ func NewCmdCreateRoute(fullName string, f kcmdutil.Factory, streams genericcliop // CreateRouteSubcommandOptions is an options struct to support create subcommands type CreateRouteSubcommandOptions struct { // PrintFlags holds options necessary for obtaining a printer - PrintFlags *create.PrintFlags + PrintFlags *genericclioptions.PrintFlags // Name of resource being created Name string ServiceName string @@ -66,7 +65,7 @@ type CreateRouteSubcommandOptions struct { func NewCreateRouteSubcommandOptions(ioStreams genericclioptions.IOStreams) *CreateRouteSubcommandOptions { return &CreateRouteSubcommandOptions{ - PrintFlags: create.NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(ocscheme.PrintingInternalScheme), IOStreams: ioStreams, } } diff --git a/pkg/oc/cli/cmd/debug.go b/pkg/oc/cli/cmd/debug.go index f94311d9c080..53e0dd1ffd37 100644 --- a/pkg/oc/cli/cmd/debug.go +++ b/pkg/oc/cli/cmd/debug.go @@ -3,7 +3,6 @@ package cmd import ( "errors" "fmt" - "io" "os" "reflect" "strings" @@ -11,26 +10,36 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" + + kappsv1 "k8s.io/api/apps/v1" + kappsv1beta1 "k8s.io/api/apps/v1beta1" + kappsv1beta2 "k8s.io/api/apps/v1beta2" + batchv1 "k8s.io/api/batch/v1" + corev1 "k8s.io/api/core/v1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" kapierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" - "k8s.io/kubernetes/pkg/apis/batch" + corev1client "k8s.io/client-go/kubernetes/typed/core/v1" + "k8s.io/kubernetes/pkg/api/legacyscheme" kapi "k8s.io/kubernetes/pkg/apis/core" - extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" - kinternalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/kubectl" kcmd "k8s.io/kubernetes/pkg/kubectl/cmd" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/genericclioptions" + "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" "k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/util/term" "k8s.io/kubernetes/pkg/util/interrupt" + appsv1 "github.com/openshift/api/apps/v1" + imagev1 "github.com/openshift/api/image/v1" appsapi "github.com/openshift/origin/pkg/apps/apis/apps" appsclientinternal "github.com/openshift/origin/pkg/apps/generated/internalclientset" appsclient "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion" @@ -44,18 +53,21 @@ import ( ) type DebugOptions struct { + PrintFlags *genericclioptions.PrintFlags + Attach kcmd.AttachOptions - AppsClient appsclient.AppsInterface - ImageClient imageclient.ImageInterface + CoreClient coreclient.CoreInterface + CoreV1Client corev1client.CoreV1Interface + AppsClient appsclient.AppsInterface + ImageClient imageclient.ImageInterface - Print func(pod *kapi.Pod, w io.Writer) error + Printer printers.ResourcePrinter LogsForObject polymorphichelpers.LogsForObjectFunc NoStdin bool ForceTTY bool DisableTTY bool - Filename string Timeout time.Duration Command []string @@ -72,6 +84,15 @@ type DebugOptions struct { NodeName string AddEnv []kapi.EnvVar RemoveEnv []string + Resources []string + Builder func() *resource.Builder + Namespace string + ExplicitNamespace bool + DryRun bool + FullCmdName string + + resource.FilenameOptions + genericclioptions.IOStreams } const ( @@ -118,39 +139,44 @@ var ( %[1]s dc/test -o yaml`) ) -// NewCmdDebug creates a command for debugging pods. -func NewCmdDebug(fullName string, f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command { - options := &DebugOptions{ - Timeout: 15 * time.Minute, +func NewDebugOptions(streams genericclioptions.IOStreams) *DebugOptions { + return &DebugOptions{ + PrintFlags: genericclioptions.NewPrintFlags("").WithTypeSetter(ocscheme.PrintingInternalScheme), + IOStreams: streams, + Timeout: 15 * time.Minute, + KeepInitContainers: true, + AsUser: -1, Attach: kcmd.AttachOptions{ StreamOptions: kcmd.StreamOptions{ IOStreams: streams, TTY: true, Stdin: true, }, - Attach: &kcmd.DefaultRemoteAttach{}, }, LogsForObject: polymorphichelpers.LogsForObjectFn, } +} +// NewCmdDebug creates a command for debugging pods. +func NewCmdDebug(fullName string, f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobra.Command { + o := NewDebugOptions(streams) cmd := &cobra.Command{ Use: "debug RESOURCE/NAME [ENV1=VAL1 ...] [-c CONTAINER] [flags] [-- COMMAND]", Short: "Launch a new instance of a pod for debugging", Long: debugLong, Example: fmt.Sprintf(debugExample, fmt.Sprintf("%s debug", fullName)), Run: func(cmd *cobra.Command, args []string) { - kcmdutil.CheckErr(options.Complete(cmd, f, args, streams.In, streams.Out, streams.ErrOut)) - kcmdutil.CheckErr(options.Validate()) - kcmdutil.CheckErr(options.Debug()) + kcmdutil.CheckErr(o.Complete(cmd, f, args)) + kcmdutil.CheckErr(o.Validate()) + kcmdutil.CheckErr(o.RunDebug()) }, } - // TODO: when T is deprecated use the printer, but keep these hidden - cmd.Flags().StringP("output", "o", "", "Output format. One of: json|yaml|wide|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://kubernetes.io/docs/user-guide/jsonpath/].") - cmd.Flags().String("output-version", "", "Output the formatted object with the given version (default api-version).") - cmd.Flags().String("template", "", "Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview].") - cmd.MarkFlagFilename("template") + usage := "to read a template" + kcmdutil.AddFilenameOptionFlags(cmd, &o.FilenameOptions, usage) + + // FIXME-REBASE: we need to wire jsonpath here and other printers cmd.Flags().Bool("no-headers", false, "If true, when using the default output, don't print headers.") cmd.Flags().MarkHidden("no-headers") cmd.Flags().String("sort-by", "", "If non-empty, sort list types using this field specification. The field specification is expressed as a JSONPath expression (e.g. 'ObjectMeta.Name'). The field in the API resource specified by this JSONPath expression must be an integer or a string.") @@ -159,27 +185,26 @@ func NewCmdDebug(fullName string, f kcmdutil.Factory, streams genericclioptions. cmd.Flags().MarkHidden("show-all") cmd.Flags().Bool("show-labels", false, "When printing, show all labels as the last column (default hide labels column)") - cmd.Flags().BoolVarP(&options.NoStdin, "no-stdin", "I", options.NoStdin, "Bypasses passing STDIN to the container, defaults to true if no command specified") - cmd.Flags().BoolVarP(&options.ForceTTY, "tty", "t", false, "Force a pseudo-terminal to be allocated") - cmd.Flags().BoolVarP(&options.DisableTTY, "no-tty", "T", false, "Disable pseudo-terminal allocation") - - cmd.Flags().StringVarP(&options.Attach.ContainerName, "container", "c", "", "Container name; defaults to first container") - cmd.Flags().BoolVar(&options.KeepAnnotations, "keep-annotations", false, "If true, keep the original pod annotations") - cmd.Flags().BoolVar(&options.KeepLiveness, "keep-liveness", false, "If true, keep the original pod liveness probes") - cmd.Flags().BoolVar(&options.KeepInitContainers, "keep-init-containers", true, "Run the init containers for the pod. Defaults to true.") - cmd.Flags().BoolVar(&options.KeepReadiness, "keep-readiness", false, "If true, keep the original pod readiness probes") - cmd.Flags().BoolVar(&options.OneContainer, "one-container", false, "If true, run only the selected container, remove all others") - cmd.Flags().StringVar(&options.NodeName, "node-name", "", "Set a specific node to run on - by default the pod will run on any valid node") - cmd.Flags().BoolVar(&options.AsRoot, "as-root", false, "If true, try to run the container as the root user") - cmd.Flags().Int64Var(&options.AsUser, "as-user", -1, "Try to run the container as a specific user UID (note: admins may limit your ability to use this flag)") - - cmd.Flags().StringVarP(&options.Filename, "filename", "f", "", "Filename or URL to file to read a template") - cmd.MarkFlagFilename("filename", "yaml", "yml", "json") + cmd.Flags().BoolVarP(&o.NoStdin, "no-stdin", "I", o.NoStdin, "Bypasses passing STDIN to the container, defaults to true if no command specified") + cmd.Flags().BoolVarP(&o.ForceTTY, "tty", "t", o.ForceTTY, "Force a pseudo-terminal to be allocated") + cmd.Flags().BoolVarP(&o.DisableTTY, "no-tty", "T", o.DisableTTY, "Disable pseudo-terminal allocation") + cmd.Flags().StringVarP(&o.Attach.ContainerName, "container", "c", o.Attach.ContainerName, "Container name; defaults to first container") + cmd.Flags().BoolVar(&o.KeepAnnotations, "keep-annotations", o.KeepAnnotations, "If true, keep the original pod annotations") + cmd.Flags().BoolVar(&o.KeepLiveness, "keep-liveness", o.KeepLiveness, "If true, keep the original pod liveness probes") + cmd.Flags().BoolVar(&o.KeepInitContainers, "keep-init-containers", o.KeepInitContainers, "Run the init containers for the pod. Defaults to true.") + cmd.Flags().BoolVar(&o.KeepReadiness, "keep-readiness", o.KeepReadiness, "If true, keep the original pod readiness probes") + cmd.Flags().BoolVar(&o.OneContainer, "one-container", o.OneContainer, "If true, run only the selected container, remove all others") + cmd.Flags().StringVar(&o.NodeName, "node-name", o.NodeName, "Set a specific node to run on - by default the pod will run on any valid node") + cmd.Flags().BoolVar(&o.AsRoot, "as-root", o.AsRoot, "If true, try to run the container as the root user") + cmd.Flags().Int64Var(&o.AsUser, "as-user", o.AsUser, "Try to run the container as a specific user UID (note: admins may limit your ability to use this flag)") + + o.PrintFlags.AddFlags(cmd) + kcmdutil.AddDryRunFlag(cmd) return cmd } -func (o *DebugOptions) Complete(cmd *cobra.Command, f kcmdutil.Factory, args []string, in io.Reader, out, errout io.Writer) error { +func (o *DebugOptions) Complete(cmd *cobra.Command, f kcmdutil.Factory, args []string) error { if i := cmd.ArgsLenAtDash(); i != -1 && i < len(args) { o.Command = args[i:] args = args[:i] @@ -188,6 +213,7 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f kcmdutil.Factory, args []s if !ok { return kcmdutil.UsageErrorf(cmd, "all resources must be specified before environment changes: %s", strings.Join(args, " ")) } + o.Resources = resources switch { case o.ForceTTY && o.NoStdin: @@ -206,7 +232,7 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f kcmdutil.Factory, args []s o.Attach.TTY = false o.Attach.Stdin = false default: - o.Attach.TTY = term.IsTerminal(in) + o.Attach.TTY = term.IsTerminal(o.In) glog.V(4).Infof("Defaulting TTY to %t", o.Attach.TTY) } if o.NoStdin { @@ -222,75 +248,39 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f kcmdutil.Factory, args []s o.Command = []string{"/bin/sh"} } - cmdNamespace, explicit, err := f.ToRawKubeConfigLoader().Namespace() + var err error + o.Namespace, o.ExplicitNamespace, err = f.ToRawKubeConfigLoader().Namespace() if err != nil { return err } - b := f.NewBuilder(). - WithScheme(ocscheme.ReadingInternalScheme). - NamespaceParam(cmdNamespace).DefaultNamespace(). - SingleResourceType(). - ResourceNames("pods", resources...). - Flatten() - if len(o.Filename) > 0 { - b.FilenameParam(explicit, &resource.FilenameOptions{Recursive: false, Filenames: []string{o.Filename}}) - } + o.Builder = f.NewBuilder o.AddEnv, o.RemoveEnv, err = utilenv.ParseEnv(envArgs, nil) if err != nil { return err } - one := false - infos, err := b.Do().IntoSingleItemImplied(&one).Infos() - if err != nil { - return err - } - if !one { - return fmt.Errorf("you must identify a resource with a pod template to debug") - } - - template, err := approximatePodTemplateForObject(f, infos[0].Object) - if err != nil && template == nil { - return fmt.Errorf("cannot debug %s: %v", infos[0].Name, err) - } - if err != nil { - glog.V(4).Infof("Unable to get exact template, but continuing with fallback: %v", err) - } - pod := &kapi.Pod{ - ObjectMeta: template.ObjectMeta, - Spec: template.Spec, + cmdParent := cmd.Parent() + if cmdParent != nil && len(cmdParent.CommandPath()) > 0 && kcmdutil.IsSiblingCommandExists(cmd, "describe") { + o.FullCmdName = cmdParent.CommandPath() } - pod.Name, pod.Namespace = fmt.Sprintf("%s-debug", generateapp.MakeSimpleName(infos[0].Name)), infos[0].Namespace - o.Attach.Pod = pod - o.AsNonRoot = !o.AsRoot && cmd.Flag("as-root").Changed - if len(o.Attach.ContainerName) == 0 && len(pod.Spec.Containers) > 0 { - fullCmdName := "" - cmdParent := cmd.Parent() - if cmdParent != nil { - fullCmdName = cmdParent.CommandPath() - } + templateArgSpecified := o.PrintFlags.TemplatePrinterFlags != nil && + o.PrintFlags.TemplatePrinterFlags.TemplateArgument != nil && + len(*o.PrintFlags.TemplatePrinterFlags.TemplateArgument) > 0 - if len(fullCmdName) > 0 && kcmdutil.IsSiblingCommandExists(cmd, "describe") { - fmt.Fprintf(o.Attach.ErrOut, "Defaulting container name to %s.\n", pod.Spec.Containers[0].Name) - fmt.Fprintf(o.Attach.ErrOut, "Use '%s describe pod/%s -n %s' to see all of the containers in this pod.\n", fullCmdName, pod.Name, pod.Namespace) - fmt.Fprintf(o.Attach.ErrOut, "\n") - } + outputFormatSpecified := o.PrintFlags.OutputFormat != nil && len(*o.PrintFlags.OutputFormat) > 0 - glog.V(4).Infof("Defaulting container name to %s", pod.Spec.Containers[0].Name) - o.Attach.ContainerName = pod.Spec.Containers[0].Name - } - - o.Annotations[debugPodAnnotationSourceResource] = fmt.Sprintf("%s/%s", infos[0].Mapping.Resource, infos[0].Name) - o.Annotations[debugPodAnnotationSourceContainer] = o.Attach.ContainerName - - output := kcmdutil.GetFlagString(cmd, "output") - if len(output) != 0 { - o.Print = func(pod *kapi.Pod, out io.Writer) error { - return kcmdutil.PrintObject(cmd, pod, out) + // TODO: below should be turned into a method on PrintFlags + if outputFormatSpecified || templateArgSpecified { + if o.DryRun { + o.PrintFlags.Complete("%s (dry run)") + } + o.Printer, err = o.PrintFlags.ToPrinter() + if err != nil { + return err } } @@ -305,6 +295,12 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f kcmdutil.Factory, args []s return err } o.Attach.PodClient = kc.Core() + o.CoreClient = kc.Core() + + o.CoreV1Client, err = corev1client.NewForConfig(config) + if err != nil { + return err + } appsClient, err := appsclientinternal.NewForConfig(config) if err != nil { @@ -317,27 +313,80 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, f kcmdutil.Factory, args []s return err } o.ImageClient = imageClient.Image() + return nil } + func (o DebugOptions) Validate() error { + if (o.AsRoot || o.AsNonRoot) && o.AsUser > 0 { + return fmt.Errorf("you may not specify --as-root and --as-user=%d at the same time", o.AsUser) + } + return nil +} + +// Debug creates and runs a debugging pod. +func (o *DebugOptions) RunDebug() error { + b := o.Builder(). + WithScheme(ocscheme.ReadingInternalScheme, ocscheme.ReadingInternalScheme.PrioritizedVersionsAllGroups()...). + NamespaceParam(o.Namespace).DefaultNamespace(). + SingleResourceType(). + ResourceNames("pods", o.Resources...). + Flatten() + if len(o.FilenameOptions.Filenames) > 0 { + b.FilenameParam(o.ExplicitNamespace, &o.FilenameOptions) + } + one := false + infos, err := b.Do().IntoSingleItemImplied(&one).Infos() + if err != nil { + return err + } + if !one { + return fmt.Errorf("you must identify a resource with a pod template to debug") + } + + templateV1, err := o.approximatePodTemplateForObject(infos[0].Object) + if err != nil && templateV1 == nil { + return fmt.Errorf("cannot debug %s: %v", infos[0].Name, err) + } + if err != nil { + glog.V(4).Infof("Unable to get exact template, but continuing with fallback: %v", err) + } + template := &kapi.PodTemplateSpec{} + if err := legacyscheme.Scheme.Convert(templateV1, template, nil); err != nil { + return err + } + pod := &kapi.Pod{ + ObjectMeta: template.ObjectMeta, + Spec: template.Spec, + } + pod.Name, pod.Namespace = fmt.Sprintf("%s-debug", generateapp.MakeSimpleName(infos[0].Name)), infos[0].Namespace + o.Attach.Pod = pod + + if len(o.Attach.ContainerName) == 0 && len(pod.Spec.Containers) > 0 { + if len(o.FullCmdName) > 0 { + fmt.Fprintf(o.ErrOut, "Defaulting container name to %s.\n", pod.Spec.Containers[0].Name) + fmt.Fprintf(o.ErrOut, "Use '%s describe pod/%s -n %s' to see all of the containers in this pod.\n", o.FullCmdName, pod.Name, pod.Namespace) + fmt.Fprintf(o.ErrOut, "\n") + } + + glog.V(4).Infof("Defaulting container name to %s", pod.Spec.Containers[0].Name) + o.Attach.ContainerName = pod.Spec.Containers[0].Name + } + names := containerNames(o.Attach.Pod) if len(names) == 0 { return fmt.Errorf("the provided pod must have at least one container") } - if (o.AsRoot || o.AsNonRoot) && o.AsUser > 0 { - return fmt.Errorf("you may not specify --as-root and --as-user=%d at the same time", o.AsUser) - } if len(o.Attach.ContainerName) == 0 { return fmt.Errorf("you must provide a container name to debug") } if containerForName(o.Attach.Pod, o.Attach.ContainerName) == nil { return fmt.Errorf("the container %q is not a valid container name; must be one of %v", o.Attach.ContainerName, names) } - return nil -} -// Debug creates and runs a debugging pod. -func (o *DebugOptions) Debug() error { + o.Annotations[debugPodAnnotationSourceResource] = fmt.Sprintf("%s/%s", infos[0].Mapping.Resource, infos[0].Name) + o.Annotations[debugPodAnnotationSourceContainer] = o.Attach.ContainerName + pod, originalCommand := o.transformPodForDebug(o.Annotations) var commandString string switch { @@ -347,13 +396,13 @@ func (o *DebugOptions) Debug() error { commandString = "" } - if o.Print != nil { - return o.Print(pod, o.Attach.Out) + if o.Printer != nil { + return o.Printer.PrintObj(kcmdutil.AsDefaultVersionedOrOriginal(pod, nil), o.Out) } glog.V(5).Infof("Creating pod: %#v", pod) - fmt.Fprintf(o.Attach.ErrOut, "Debugging with pod/%s, original command: %s\n", pod.Name, commandString) - pod, err := o.createPod(pod) + fmt.Fprintf(o.ErrOut, "Debugging with pod/%s, original command: %s\n", pod.Name, commandString) + pod, err = o.createPod(pod) if err != nil { return err } @@ -362,7 +411,7 @@ func (o *DebugOptions) Debug() error { o.Attach.InterruptParent = interrupt.New( func(os.Signal) { os.Exit(1) }, func() { - stderr := o.Attach.ErrOut + stderr := o.ErrOut if stderr == nil { stderr = os.Stderr } @@ -381,7 +430,7 @@ func (o *DebugOptions) Debug() error { if err != nil { return err } - fmt.Fprintf(o.Attach.ErrOut, "Waiting for pod to start ...\n") + fmt.Fprintf(o.ErrOut, "Waiting for pod to start ...\n") switch containerRunningEvent, err := watch.Until(o.Timeout, w, kubectl.PodContainerRunning(o.Attach.ContainerName)); { // api didn't error right away but the pod wasn't even created @@ -399,8 +448,7 @@ func (o *DebugOptions) Debug() error { Container: o.Attach.ContainerName, Follow: true, }, - IOStreams: o.Attach.IOStreams, - + IOStreams: o.IOStreams, LogsForObject: o.LogsForObject, }.RunLogs() case err != nil: @@ -675,62 +723,54 @@ func containerNames(pod *kapi.Pod) []string { return names } -// ApproximatePodTemplateForObject returns a pod template object for the provided source. -// It may return both an error and a object. It attempt to return the best possible template -// available at the current time. -func approximatePodTemplateForObject(restClientGetter genericclioptions.RESTClientGetter, object runtime.Object) (*kapi.PodTemplateSpec, error) { +func (o *DebugOptions) approximatePodTemplateForObject(object runtime.Object) (*corev1.PodTemplateSpec, error) { switch t := object.(type) { - case *imageapi.ImageStreamTag: + case *imagev1.ImageStreamTag: // create a minimal pod spec that uses the image referenced by the istag without any introspection // it possible that we could someday do a better job introspecting it - return &kapi.PodTemplateSpec{ - Spec: kapi.PodSpec{ - RestartPolicy: kapi.RestartPolicyNever, - Containers: []kapi.Container{ + return &corev1.PodTemplateSpec{ + Spec: corev1.PodSpec{ + RestartPolicy: corev1.RestartPolicyNever, + Containers: []corev1.Container{ {Name: "container-00", Image: t.Image.DockerImageReference}, }, }, }, nil - case *imageapi.ImageStreamImage: + case *imagev1.ImageStreamImage: // create a minimal pod spec that uses the image referenced by the istag without any introspection // it possible that we could someday do a better job introspecting it - return &kapi.PodTemplateSpec{ - Spec: kapi.PodSpec{ - RestartPolicy: kapi.RestartPolicyNever, - Containers: []kapi.Container{ + return &corev1.PodTemplateSpec{ + Spec: corev1.PodSpec{ + RestartPolicy: corev1.RestartPolicyNever, + Containers: []corev1.Container{ {Name: "container-00", Image: t.Image.DockerImageReference}, }, }, }, nil - case *appsapi.DeploymentConfig: + case *appsv1.DeploymentConfig: fallback := t.Spec.Template - clientConfig, err := restClientGetter.ToRESTConfig() - if err != nil { - return fallback, err - } - kc, err := kinternalclientset.NewForConfig(clientConfig) - if err != nil { - return fallback, err - } - - latestDeploymentName := appsutil.LatestDeploymentNameForConfig(t) - deployment, err := kc.Core().ReplicationControllers(t.Namespace).Get(latestDeploymentName, metav1.GetOptions{}) + latestDeploymentName := appsutil.LatestDeploymentNameForConfigV1(t) + deployment, err := o.CoreV1Client.ReplicationControllers(t.Namespace).Get(latestDeploymentName, metav1.GetOptions{}) if err != nil { return fallback, err } fallback = deployment.Spec.Template - pods, err := kc.Core().Pods(deployment.Namespace).List(metav1.ListOptions{LabelSelector: labels.SelectorFromSet(deployment.Spec.Selector).String()}) + pods, err := o.CoreV1Client.Pods(deployment.Namespace).List(metav1.ListOptions{LabelSelector: labels.SelectorFromSet(deployment.Spec.Selector).String()}) if err != nil { return fallback, err } + // If we have any pods available, find the newest + // pod with regards to our most recent deployment. + // If the fallback PodTemplateSpec is nil, prefer + // the newest pod available. for i := range pods.Items { pod := &pods.Items[i] if fallback == nil || pod.CreationTimestamp.Before(&fallback.CreationTimestamp) { - fallback = &kapi.PodTemplateSpec{ + fallback = &corev1.PodTemplateSpec{ ObjectMeta: pod.ObjectMeta, Spec: pod.Spec, } @@ -738,20 +778,44 @@ func approximatePodTemplateForObject(restClientGetter genericclioptions.RESTClie } return fallback, nil - case *kapi.Pod: - return &kapi.PodTemplateSpec{ + case *corev1.Pod: + return &corev1.PodTemplateSpec{ ObjectMeta: t.ObjectMeta, Spec: t.Spec, }, nil - case *kapi.ReplicationController: + + // ReplicationController + case *corev1.ReplicationController: return t.Spec.Template, nil - case *extensionsinternal.ReplicaSet: + + // ReplicaSet + case *extensionsv1beta1.ReplicaSet: + return &t.Spec.Template, nil + case *kappsv1beta2.ReplicaSet: return &t.Spec.Template, nil - case *extensionsinternal.DaemonSet: + case *kappsv1.ReplicaSet: + return &t.Spec.Template, nil + + // Deployment + case *extensionsv1beta1.Deployment: return &t.Spec.Template, nil - case *extensionsinternal.Deployment: + case *kappsv1beta1.Deployment: return &t.Spec.Template, nil - case *batch.Job: + case *kappsv1beta2.Deployment: + return &t.Spec.Template, nil + case *kappsv1.Deployment: + return &t.Spec.Template, nil + + // DaemonSet + case *extensionsv1beta1.DaemonSet: + return &t.Spec.Template, nil + case *kappsv1beta2.DaemonSet: + return &t.Spec.Template, nil + case *kappsv1.DaemonSet: + return &t.Spec.Template, nil + + // Job + case *batchv1.Job: return &t.Spec.Template, nil } diff --git a/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh b/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh index 91f08751d679..a4c110248419 100755 --- a/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh +++ b/vendor/k8s.io/kubernetes/hack/make-rules/test-cmd-util.sh @@ -1704,6 +1704,220 @@ run_kubectl_request_timeout_tests() { set +o errexit } +run_template_output_tests() { + set -o nounset + set -o errexit + + kube::log::status "Testing --template support on commands" + ### Test global request timeout option + # Pre-condition: no POD exists + create_and_use_new_namespace + kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" '' + # Command + # check that create supports --template output + kubectl create "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml + # Post-condition: valid-pod POD is created + kubectl get "${kube_flags[@]}" pods -o json + kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'valid-pod:' + + # check that patch command supports --template output + output_message=$(kubectl "${kube_flags[@]}" patch --dry-run pods/valid-pod -p '{"patched":"value3"}' --type=merge --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'valid-pod:' + + # check that label command supports --template output + output_message=$(kubectl "${kube_flags[@]}" label --dry-run pods/valid-pod label=value --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'valid-pod:' + + # check that annotate command supports --template output + output_message=$(kubectl "${kube_flags[@]}" annotate --dry-run pods/valid-pod annotation=value --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'valid-pod:' + + # check that apply command supports --template output + output_message=$(kubectl "${kube_flags[@]}" apply --dry-run -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'valid-pod:' + + # check that create command supports --template output + output_message=$(kubectl "${kube_flags[@]}" create -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml --dry-run --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'valid-pod:' + + # check that autoscale command supports --template output + output_message=$(kubectl "${kube_flags[@]}" autoscale --max=2 -f hack/testdata/scale-deploy-1.yaml --dry-run --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'scale-1:' + + # check that expose command supports --template output + output_message=$(kubectl "${kube_flags[@]}" expose -f hack/testdata/redis-slave-replicaset.yaml --save-config --port=80 --target-port=8000 --dry-run --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'redis-slave:' + + # check that convert command supports --template output + output_message=$(kubectl "${kube_flags[@]}" convert -f hack/testdata/deployment-revision1.yaml --output-version=apps/v1beta1 --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'nginx:' + + # check that run command supports --template output + output_message=$(kubectl "${kube_flags[@]}" run --dry-run --template="{{ .metadata.name }}:" pi --image=perl --restart=OnFailure -- perl -Mbignum=bpi -wle 'print bpi(2000)') + kube::test::if_has_string "${output_message}" 'pi:' + + # check that taint command supports --template output + output_message=$(kubectl "${kube_flags[@]}" taint node 127.0.0.1 dedicated=foo:PreferNoSchedule --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" '127.0.0.1:' + # untaint node + kubectl taint node 127.0.0.1 dedicated- + + # check that "apply set-last-applied" command supports --template output + kubectl "${kube_flags[@]}" create -f test/e2e/testing-manifests/statefulset/cassandra/controller.yaml + output_message=$(kubectl "${kube_flags[@]}" apply set-last-applied -f test/e2e/testing-manifests/statefulset/cassandra/controller.yaml --dry-run --create-annotation --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'cassandra:' + + # check that "auth reconcile" command supports --template output + output_message=$(kubectl "${kube_flags[@]}" auth reconcile --dry-run -f test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'testing-CR:testing-CRB:testing-RB:testing-R:' + + # check that "create clusterrole" command supports --template output + output_message=$(kubectl "${kube_flags[@]}" create clusterrole --template="{{ .metadata.name }}:" --verb get myclusterrole --non-resource-url /logs/ --resource pods) + kube::test::if_has_string "${output_message}" 'myclusterrole:' + + # check that "create clusterrolebinding" command supports --template output + output_message=$(kubectl "${kube_flags[@]}" create clusterrolebinding foo --clusterrole=myclusterrole --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'foo:' + + # check that "create configmap" command supports --template output + output_message=$(kubectl "${kube_flags[@]}" create configmap cm --dry-run --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'cm:' + + # check that "create deployment" command supports --template output + output_message=$(kubectl "${kube_flags[@]}" create deployment deploy --dry-run --image=nginx --template="{{ .metadata.name }}:") + kube::test::if_has_string "${output_message}" 'deploy:' + + # check that "create job" command supports --template output + kubectl create "${kube_flags[@]}" -f - <&1 "${kube_flags[@]}") kube::test::if_empty_string "${output_message}" - + output_message=$(kubectl auth can-i get pods --subresource=log 2>&1 "${kube_flags[@]}"; echo $?) kube::test::if_has_string "${output_message}" '0' @@ -5392,6 +5606,14 @@ runTests() { fi fi + ###################### + # kubectl --template # + ###################### + + if kube::test::if_supports_resource "${pods}" ; then + record_command run_template_output_tests + fi + ################ # Certificates # ################ diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/cmd_printing_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/cmd_printing_test.go index 966827ac0651..68de2451add3 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/cmd_printing_test.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/cmd_printing_test.go @@ -120,12 +120,12 @@ func TestIllegalPackageSourceCheckerThroughPrintFlags(t *testing.T) { } func TestIllegalPackageSourceCheckerDirectlyThroughPrinters(t *testing.T) { - jsonPathPrinter, err := printers.NewJSONPathPrinter("{ .metadata.name }") + jsonPathPrinter, err := genericprinters.NewJSONPathPrinter("{ .metadata.name }") if err != nil { t.Fatalf("unexpected error: %v", err) } - goTemplatePrinter, err := printers.NewGoTemplatePrinter([]byte("{{ .metadata.name }}")) + goTemplatePrinter, err := genericprinters.NewGoTemplatePrinter([]byte("{{ .metadata.name }}")) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -138,7 +138,7 @@ func TestIllegalPackageSourceCheckerDirectlyThroughPrinters(t *testing.T) { testCases := []struct { name string expectInternalObjErr bool - printer printers.ResourcePrinter + printer genericprinters.ResourcePrinter obj runtime.Object expectedOutput string }{ diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/BUILD b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/BUILD index 84f82ab1b436..60238dc8afa7 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/BUILD @@ -14,7 +14,6 @@ go_library( "current_context.go", "delete_cluster.go", "delete_context.go", - "flags.go", "get_clusters.go", "get_contexts.go", "navigation_step_parser.go", @@ -33,11 +32,9 @@ go_library( "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/genericclioptions:go_default_library", - "//pkg/kubectl/genericclioptions/printers:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", "//pkg/printers:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library", diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/flags.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/flags.go deleted file mode 100644 index 5e2f3ed8067d..000000000000 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/flags.go +++ /dev/null @@ -1,101 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package config - -import ( - "github.com/spf13/cobra" - - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/kubectl/genericclioptions" - genericprinters "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" - "k8s.io/kubernetes/pkg/printers" -) - -// kubectlConfigPrintFlags composes common printer flag structs -// used across all config commands, and provides a method -// of retrieving a known printer based on flag values provided. -type kubectlConfigPrintFlags struct { - JSONYamlPrintFlags *genericclioptions.JSONYamlPrintFlags - NamePrintFlags *genericclioptions.NamePrintFlags - TemplateFlags *printers.KubeTemplatePrintFlags - - TypeSetter *genericprinters.TypeSetterPrinter - - OutputFormat *string -} - -func (f *kubectlConfigPrintFlags) Complete(successTemplate string) error { - return f.NamePrintFlags.Complete(successTemplate) -} - -func (f *kubectlConfigPrintFlags) AllowedFormats() []string { - formats := f.JSONYamlPrintFlags.AllowedFormats() - formats = append(formats, f.NamePrintFlags.AllowedFormats()...) - formats = append(formats, f.TemplateFlags.AllowedFormats()...) - return formats -} - -func (f *kubectlConfigPrintFlags) ToPrinter() (printers.ResourcePrinter, error) { - outputFormat := "" - if f.OutputFormat != nil { - outputFormat = *f.OutputFormat - } - - if p, err := f.JSONYamlPrintFlags.ToPrinter(outputFormat); !genericclioptions.IsNoCompatiblePrinterError(err) { - return f.TypeSetter.WrapToPrinter(p, err) - } - - if p, err := f.NamePrintFlags.ToPrinter(outputFormat); !genericclioptions.IsNoCompatiblePrinterError(err) { - return f.TypeSetter.WrapToPrinter(p, err) - } - - if p, err := f.TemplateFlags.ToPrinter(outputFormat); !genericclioptions.IsNoCompatiblePrinterError(err) { - return f.TypeSetter.WrapToPrinter(p, err) - } - - return nil, genericclioptions.NoCompatiblePrinterError{OutputFormat: &outputFormat, AllowedFormats: f.AllowedFormats()} -} - -func (f *kubectlConfigPrintFlags) AddFlags(cmd *cobra.Command) { - f.JSONYamlPrintFlags.AddFlags(cmd) - f.NamePrintFlags.AddFlags(cmd) - f.TemplateFlags.AddFlags(cmd) - - if f.OutputFormat != nil { - cmd.Flags().StringVarP(f.OutputFormat, "output", "o", *f.OutputFormat, "Output format. One of: json|yaml|name|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See custom columns [http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns], golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://kubernetes.io/docs/user-guide/jsonpath].") - } -} - -// WithDefaultOutput sets a default output format if one is not provided through a flag value -func (f *kubectlConfigPrintFlags) WithDefaultOutput(output string) *kubectlConfigPrintFlags { - f.OutputFormat = &output - return f -} - -func newKubeConfigPrintFlags(scheme runtime.ObjectTyper) *kubectlConfigPrintFlags { - outputFormat := "" - - return &kubectlConfigPrintFlags{ - OutputFormat: &outputFormat, - - JSONYamlPrintFlags: genericclioptions.NewJSONYamlPrintFlags(), - NamePrintFlags: genericclioptions.NewNamePrintFlags(""), - TemplateFlags: printers.NewKubeTemplatePrintFlags(), - - TypeSetter: genericprinters.NewTypeSetter(scheme), - } -} diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/view.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/view.go index eb82a7731a07..476aab34029b 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/view.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/config/view.go @@ -34,7 +34,7 @@ import ( ) type ViewOptions struct { - PrintFlags *kubectlConfigPrintFlags + PrintFlags *genericclioptions.PrintFlags PrintObject printers.ResourcePrinterFunc ConfigAccess clientcmd.ConfigAccess @@ -70,7 +70,7 @@ var ( func NewCmdConfigView(f cmdutil.Factory, streams genericclioptions.IOStreams, ConfigAccess clientcmd.ConfigAccess) *cobra.Command { o := &ViewOptions{ - PrintFlags: newKubeConfigPrintFlags(legacyscheme.Scheme).WithDefaultOutput("yaml"), + PrintFlags: genericclioptions.NewPrintFlags("").WithTypeSetter(legacyscheme.Scheme).WithDefaultOutput("yaml"), ConfigAccess: ConfigAccess, IOStreams: streams, diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/BUILD b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/BUILD index 94f8d996b9ed..7f67fa4cc3fc 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/BUILD @@ -18,7 +18,6 @@ go_library( "create_secret.go", "create_service.go", "create_serviceaccount.go", - "flags.go", ], importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/create", visibility = ["//build/visible_to:pkg_kubectl_cmd_create_CONSUMERS"], @@ -29,7 +28,6 @@ go_library( "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util/editor:go_default_library", "//pkg/kubectl/genericclioptions:go_default_library", - "//pkg/kubectl/genericclioptions/printers:go_default_library", "//pkg/kubectl/genericclioptions/resource:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create.go index 556e6d15afaa..a6bb8b03b8e5 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create.go @@ -44,7 +44,7 @@ import ( ) type CreateOptions struct { - PrintFlags *PrintFlags + PrintFlags *genericclioptions.PrintFlags RecordFlags *genericclioptions.RecordFlags DryRun bool @@ -79,7 +79,7 @@ var ( func NewCreateOptions(ioStreams genericclioptions.IOStreams) *CreateOptions { return &CreateOptions{ - PrintFlags: NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme), RecordFlags: genericclioptions.NewRecordFlags(), Recorder: genericclioptions.NoopRecorder{}, @@ -336,7 +336,7 @@ func NameFromCommandArgs(cmd *cobra.Command, args []string) (string, error) { // CreateSubcommandOptions is an options struct to support create subcommands type CreateSubcommandOptions struct { // PrintFlags holds options necessary for obtaining a printer - PrintFlags *PrintFlags + PrintFlags *genericclioptions.PrintFlags // Name of resource being created Name string // StructuredGenerator is the resource generator for the object being created @@ -358,7 +358,7 @@ type CreateSubcommandOptions struct { func NewCreateSubcommandOptions(ioStreams genericclioptions.IOStreams) *CreateSubcommandOptions { return &CreateSubcommandOptions{ - PrintFlags: NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme), IOStreams: ioStreams, } } diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_deployment_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_deployment_test.go index bd42fcfedd0d..1df3066eb69e 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_deployment_test.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_deployment_test.go @@ -140,7 +140,7 @@ func TestCreateDeploymentNoImage(t *testing.T) { cmd.Flags().Set("output", "name") options := &DeploymentOpts{ CreateSubcommandOptions: &CreateSubcommandOptions{ - PrintFlags: NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme), DryRun: true, IOStreams: ioStreams, }, diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_job.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_job.go index d4f024e470ba..1e92754def48 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_job.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_job.go @@ -45,7 +45,7 @@ var ( ) type CreateJobOptions struct { - PrintFlags *PrintFlags + PrintFlags *genericclioptions.PrintFlags PrintObj func(obj runtime.Object) error @@ -64,7 +64,7 @@ type CreateJobOptions struct { func NewCreateJobOptions(ioStreams genericclioptions.IOStreams) *CreateJobOptions { return &CreateJobOptions{ - PrintFlags: NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme), IOStreams: ioStreams, } } diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_job_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_job_test.go index 7aa14cc9f3fa..d866c8e83469 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_job_test.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_job_test.go @@ -85,7 +85,7 @@ func TestCreateJobFromCronJob(t *testing.T) { f := cmdtesting.NewTestFactory() defer f.Cleanup() - printFlags := NewPrintFlags("created", legacyscheme.Scheme) + printFlags := genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme) ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmdOptions := &CreateJobOptions{ diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_pdb_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_pdb_test.go index 01d6ee99e8d2..42e7652c030d 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_pdb_test.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_pdb_test.go @@ -58,7 +58,7 @@ func TestCreatePdb(t *testing.T) { cmd.Flags().Set("dry-run", "true") cmd.Flags().Set("output", outputFormat) - printFlags := NewPrintFlags("created", legacyscheme.Scheme) + printFlags := genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme) printFlags.OutputFormat = &outputFormat options := &PodDisruptionBudgetOpts{ diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_priorityclass_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_priorityclass_test.go index 2f775be6385c..b25aaa7a2251 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_priorityclass_test.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_priorityclass_test.go @@ -59,7 +59,7 @@ func TestCreatePriorityClass(t *testing.T) { cmd.Flags().Set("dry-run", "true") cmd.Flags().Set("output", outputFormat) - printFlags := NewPrintFlags("created", legacyscheme.Scheme) + printFlags := genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme) printFlags.OutputFormat = &outputFormat options := &PriorityClassOpts{ diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_role.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_role.go index d01014b45f19..764f2ed1586d 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_role.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_role.go @@ -102,7 +102,7 @@ type ResourceOptions struct { } type CreateRoleOptions struct { - PrintFlags *PrintFlags + PrintFlags *genericclioptions.PrintFlags Name string Verbs []string @@ -121,7 +121,7 @@ type CreateRoleOptions struct { func NewCreateRoleOptions(ioStreams genericclioptions.IOStreams) *CreateRoleOptions { return &CreateRoleOptions{ - PrintFlags: NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme), IOStreams: ioStreams, } diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_role_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_role_test.go index 4551bea8541d..506e30333dc2 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_role_test.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/create_role_test.go @@ -372,14 +372,14 @@ func TestComplete(t *testing.T) { "test-missing-name": { params: []string{}, roleOptions: &CreateRoleOptions{ - PrintFlags: NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme), }, expectErr: true, }, "test-duplicate-verbs": { params: []string{roleName}, roleOptions: &CreateRoleOptions{ - PrintFlags: NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme), Name: roleName, Verbs: []string{ "get", @@ -412,7 +412,7 @@ func TestComplete(t *testing.T) { "test-verball": { params: []string{roleName}, roleOptions: &CreateRoleOptions{ - PrintFlags: NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme), Name: roleName, Verbs: []string{ "get", @@ -441,7 +441,7 @@ func TestComplete(t *testing.T) { "test-duplicate-resourcenames": { params: []string{roleName}, roleOptions: &CreateRoleOptions{ - PrintFlags: NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme), Name: roleName, Verbs: []string{"*"}, ResourceNames: []string{"foo", "foo"}, @@ -466,7 +466,7 @@ func TestComplete(t *testing.T) { "test-valid-complete-case": { params: []string{roleName}, roleOptions: &CreateRoleOptions{ - PrintFlags: NewPrintFlags("created", legacyscheme.Scheme), + PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(legacyscheme.Scheme), Name: roleName, Verbs: []string{"*"}, ResourceNames: []string{"foo"}, diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/flags.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/flags.go deleted file mode 100644 index e1bf63cf465f..000000000000 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/create/flags.go +++ /dev/null @@ -1,93 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package create - -import ( - "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/kubectl/genericclioptions" - - "k8s.io/apimachinery/pkg/runtime" - genericprinters "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" - "k8s.io/kubernetes/pkg/printers" -) - -// PrintFlags composes common printer flag structs -// used across all create commands, and provides a method -// of retrieving a known printer based on flag values provided. -type PrintFlags struct { - JSONYamlPrintFlags *genericclioptions.JSONYamlPrintFlags - NamePrintFlags *genericclioptions.NamePrintFlags - TemplateFlags *printers.KubeTemplatePrintFlags - - TypeSetter *genericprinters.TypeSetterPrinter - - OutputFormat *string -} - -func (f *PrintFlags) AllowedFormats() []string { - return append(append(f.JSONYamlPrintFlags.AllowedFormats(), f.NamePrintFlags.AllowedFormats()...), - f.TemplateFlags.AllowedFormats()...) -} - -func (f *PrintFlags) Complete(successTemplate string) error { - return f.NamePrintFlags.Complete(successTemplate) -} - -func (f *PrintFlags) ToPrinter() (printers.ResourcePrinter, error) { - outputFormat := "" - if f.OutputFormat != nil { - outputFormat = *f.OutputFormat - } - - if p, err := f.JSONYamlPrintFlags.ToPrinter(outputFormat); !genericclioptions.IsNoCompatiblePrinterError(err) { - return f.TypeSetter.WrapToPrinter(p, err) - } - - if p, err := f.NamePrintFlags.ToPrinter(outputFormat); !genericclioptions.IsNoCompatiblePrinterError(err) { - return f.TypeSetter.WrapToPrinter(p, err) - } - - if p, err := f.TemplateFlags.ToPrinter(outputFormat); !genericclioptions.IsNoCompatiblePrinterError(err) { - return f.TypeSetter.WrapToPrinter(p, err) - } - - return nil, genericclioptions.NoCompatiblePrinterError{OutputFormat: &outputFormat, AllowedFormats: f.AllowedFormats()} -} - -func (f *PrintFlags) AddFlags(cmd *cobra.Command) { - f.JSONYamlPrintFlags.AddFlags(cmd) - f.NamePrintFlags.AddFlags(cmd) - f.TemplateFlags.AddFlags(cmd) - - if f.OutputFormat != nil { - cmd.Flags().StringVarP(f.OutputFormat, "output", "o", *f.OutputFormat, "Output format. One of: json|yaml|wide|name|custom-columns=...|custom-columns-file=...|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See custom columns [http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns], golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://kubernetes.io/docs/user-guide/jsonpath].") - } -} - -func NewPrintFlags(operation string, scheme runtime.ObjectTyper) *PrintFlags { - outputFormat := "" - - return &PrintFlags{ - OutputFormat: &outputFormat, - - JSONYamlPrintFlags: genericclioptions.NewJSONYamlPrintFlags(), - NamePrintFlags: genericclioptions.NewNamePrintFlags(operation), - TemplateFlags: printers.NewKubeTemplatePrintFlags(), - - TypeSetter: genericprinters.NewTypeSetter(scheme), - } -} diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/get_flags.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/get_flags.go index 6905f0ff4fb4..bc05ac05c726 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/get_flags.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get/get_flags.go @@ -35,7 +35,7 @@ type PrintFlags struct { NamePrintFlags *genericclioptions.NamePrintFlags CustomColumnsFlags *printers.CustomColumnsPrintFlags HumanReadableFlags *HumanPrintFlags - TemplateFlags *printers.KubeTemplatePrintFlags + TemplateFlags *genericclioptions.KubeTemplatePrintFlags NoHeaders *bool OutputFormat *string @@ -182,7 +182,7 @@ func NewGetPrintFlags() *PrintFlags { JSONYamlPrintFlags: genericclioptions.NewJSONYamlPrintFlags(), NamePrintFlags: genericclioptions.NewNamePrintFlags(""), - TemplateFlags: printers.NewKubeTemplatePrintFlags(), + TemplateFlags: genericclioptions.NewKubeTemplatePrintFlags(), HumanReadableFlags: NewHumanPrintFlags(), CustomColumnsFlags: printers.NewCustomColumnsPrintFlags(), diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/replace.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/replace.go index 7c94ddf4973e..d44f7625c593 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/replace.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/replace.go @@ -89,15 +89,8 @@ type ReplaceOptions struct { } func NewReplaceOptions(streams genericclioptions.IOStreams) *ReplaceOptions { - outputFormat := "" - return &ReplaceOptions{ - // TODO(juanvallejo): figure out why we only support the "name" outputFormat in this command - // we only support "-o name" for this command, so only register the name printer - PrintFlags: &genericclioptions.PrintFlags{ - OutputFormat: &outputFormat, - NamePrintFlags: genericclioptions.NewNamePrintFlags("replaced"), - }, + PrintFlags: genericclioptions.NewPrintFlags("replaced"), DeleteFlags: NewDeleteFlags("to use to replace the resource."), IOStreams: streams, diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/scale.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/scale.go index 1f8c4f2577c8..a883456dd277 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/scale.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/scale.go @@ -93,15 +93,8 @@ type ScaleOptions struct { } func NewScaleOptions(ioStreams genericclioptions.IOStreams) *ScaleOptions { - outputFormat := "" - return &ScaleOptions{ - // TODO(juanvallejo): figure out why we only support the "name" outputFormat in this command - // we only support "-o name" for this command, so only register the name printer - PrintFlags: &genericclioptions.PrintFlags{ - OutputFormat: &outputFormat, - NamePrintFlags: genericclioptions.NewNamePrintFlags("scaled"), - }, + PrintFlags: genericclioptions.NewPrintFlags("scaled"), RecordFlags: genericclioptions.NewRecordFlags(), CurrentReplicas: -1, Recorder: genericclioptions.NoopRecorder{}, diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/BUILD b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/BUILD index 0a04b54eeace..538fad85a84e 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/BUILD @@ -11,9 +11,12 @@ go_library( "filename_flags.go", "io_options.go", "json_yaml_flags.go", + "jsonpath_flags.go", + "kube_template_flags.go", "name_flags.go", "print_flags.go", "record_flags.go", + "template_flags.go", ], importpath = "k8s.io/kubernetes/pkg/kubectl/genericclioptions", visibility = ["//visibility:public"], @@ -57,7 +60,9 @@ go_test( name = "go_default_test", srcs = [ "json_yaml_flags_test.go", + "jsonpath_flags_test.go", "name_flags_test.go", + "template_flags_test.go", ], embed = [":go_default_library"], deps = [ diff --git a/vendor/k8s.io/kubernetes/pkg/printers/jsonpath_flags.go b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/jsonpath_flags.go similarity index 89% rename from vendor/k8s.io/kubernetes/pkg/printers/jsonpath_flags.go rename to vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/jsonpath_flags.go index d95f737620f8..c495fcd8b857 100644 --- a/vendor/k8s.io/kubernetes/pkg/printers/jsonpath_flags.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/jsonpath_flags.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package printers +package genericclioptions import ( "fmt" @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/kubectl/genericclioptions" + "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" ) // templates are logically optional for specifying a format. @@ -55,9 +55,9 @@ func (f *JSONPathPrintFlags) AllowedFormats() []string { // ToPrinter receives an templateFormat and returns a printer capable of // handling --template format printing. // Returns false if the specified templateFormat does not match a template format. -func (f *JSONPathPrintFlags) ToPrinter(templateFormat string) (ResourcePrinter, error) { +func (f *JSONPathPrintFlags) ToPrinter(templateFormat string) (printers.ResourcePrinter, error) { if (f.TemplateArgument == nil || len(*f.TemplateArgument) == 0) && len(templateFormat) == 0 { - return nil, genericclioptions.NoCompatiblePrinterError{Options: f, OutputFormat: &templateFormat} + return nil, NoCompatiblePrinterError{Options: f, OutputFormat: &templateFormat} } templateValue := "" @@ -76,7 +76,7 @@ func (f *JSONPathPrintFlags) ToPrinter(templateFormat string) (ResourcePrinter, } if _, supportedFormat := jsonFormats[templateFormat]; !supportedFormat { - return nil, genericclioptions.NoCompatiblePrinterError{OutputFormat: &templateFormat, AllowedFormats: f.AllowedFormats()} + return nil, NoCompatiblePrinterError{OutputFormat: &templateFormat, AllowedFormats: f.AllowedFormats()} } if len(templateValue) == 0 { @@ -92,7 +92,7 @@ func (f *JSONPathPrintFlags) ToPrinter(templateFormat string) (ResourcePrinter, templateValue = string(data) } - p, err := NewJSONPathPrinter(templateValue) + p, err := printers.NewJSONPathPrinter(templateValue) if err != nil { return nil, fmt.Errorf("error parsing jsonpath %s, %v\n", templateValue, err) } diff --git a/vendor/k8s.io/kubernetes/pkg/printers/jsonpath_flags_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/jsonpath_flags_test.go similarity index 96% rename from vendor/k8s.io/kubernetes/pkg/printers/jsonpath_flags_test.go rename to vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/jsonpath_flags_test.go index 2f5b6c4c7c2e..bf0c087bc1b9 100644 --- a/vendor/k8s.io/kubernetes/pkg/printers/jsonpath_flags_test.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/jsonpath_flags_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package printers +package genericclioptions import ( "bytes" @@ -26,7 +26,6 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/kubectl/genericclioptions" ) func TestPrinterSupportsExpectedJSONPathFormats(t *testing.T) { @@ -105,12 +104,12 @@ func TestPrinterSupportsExpectedJSONPathFormats(t *testing.T) { p, err := printFlags.ToPrinter(tc.outputFormat) if tc.expectNoMatch { - if !genericclioptions.IsNoCompatiblePrinterError(err) { + if !IsNoCompatiblePrinterError(err) { t.Fatalf("expected no printer matches for output format %q", tc.outputFormat) } return } - if genericclioptions.IsNoCompatiblePrinterError(err) { + if IsNoCompatiblePrinterError(err) { t.Fatalf("expected to match template printer for output format %q", tc.outputFormat) } @@ -184,7 +183,7 @@ func TestJSONPathPrinterDefaultsAllowMissingKeysToTrue(t *testing.T) { outputFormat := "jsonpath" p, err := printFlags.ToPrinter(outputFormat) - if genericclioptions.IsNoCompatiblePrinterError(err) { + if IsNoCompatiblePrinterError(err) { t.Fatalf("expected to match template printer for output format %q", outputFormat) } if err != nil { diff --git a/vendor/k8s.io/kubernetes/pkg/printers/kube_template_flags.go b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/kube_template_flags.go similarity index 85% rename from vendor/k8s.io/kubernetes/pkg/printers/kube_template_flags.go rename to vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/kube_template_flags.go index 8b53e60cdc56..b44a1b038429 100644 --- a/vendor/k8s.io/kubernetes/pkg/printers/kube_template_flags.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/kube_template_flags.go @@ -14,31 +14,37 @@ See the License for the specific language governing permissions and limitations under the License. */ -package printers +package genericclioptions import ( "github.com/spf13/cobra" - - "k8s.io/kubernetes/pkg/kubectl/genericclioptions" + "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" ) // KubeTemplatePrintFlags composes print flags that provide both a JSONPath and a go-template printer. // This is necessary if dealing with cases that require support both both printers, since both sets of flags // require overlapping flags. type KubeTemplatePrintFlags struct { - *GoTemplatePrintFlags - *JSONPathPrintFlags + GoTemplatePrintFlags *GoTemplatePrintFlags + JSONPathPrintFlags *JSONPathPrintFlags AllowMissingKeys *bool TemplateArgument *string } func (f *KubeTemplatePrintFlags) AllowedFormats() []string { + if f == nil { + return []string{} + } return append(f.GoTemplatePrintFlags.AllowedFormats(), f.JSONPathPrintFlags.AllowedFormats()...) } -func (f *KubeTemplatePrintFlags) ToPrinter(outputFormat string) (ResourcePrinter, error) { - if p, err := f.JSONPathPrintFlags.ToPrinter(outputFormat); !genericclioptions.IsNoCompatiblePrinterError(err) { +func (f *KubeTemplatePrintFlags) ToPrinter(outputFormat string) (printers.ResourcePrinter, error) { + if f == nil { + return nil, NoCompatiblePrinterError{} + } + + if p, err := f.JSONPathPrintFlags.ToPrinter(outputFormat); !IsNoCompatiblePrinterError(err) { return p, err } return f.GoTemplatePrintFlags.ToPrinter(outputFormat) @@ -47,6 +53,10 @@ func (f *KubeTemplatePrintFlags) ToPrinter(outputFormat string) (ResourcePrinter // AddFlags receives a *cobra.Command reference and binds // flags related to template printing to it func (f *KubeTemplatePrintFlags) AddFlags(c *cobra.Command) { + if f == nil { + return + } + if f.TemplateArgument != nil { c.Flags().StringVar(f.TemplateArgument, "template", *f.TemplateArgument, "Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview].") c.MarkFlagFilename("template") diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/print_flags.go b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/print_flags.go index 44b76c313c4f..428d0dff4442 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/print_flags.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/print_flags.go @@ -22,6 +22,8 @@ import ( "strings" "github.com/spf13/cobra" + "github.com/spf13/pflag" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" ) @@ -55,12 +57,15 @@ func IsNoCompatiblePrinterError(err error) bool { // used across all commands, and provides a method // of retrieving a known printer based on flag values provided. type PrintFlags struct { - JSONYamlPrintFlags *JSONYamlPrintFlags - NamePrintFlags *NamePrintFlags + JSONYamlPrintFlags *JSONYamlPrintFlags + NamePrintFlags *NamePrintFlags + TemplatePrinterFlags *KubeTemplatePrintFlags TypeSetterPrinter *printers.TypeSetterPrinter - OutputFormat *string + OutputFormat *string + outputFlag *pflag.Flag + outputDefaulted bool } func (f *PrintFlags) Complete(successTemplate string) error { @@ -68,7 +73,11 @@ func (f *PrintFlags) Complete(successTemplate string) error { } func (f *PrintFlags) AllowedFormats() []string { - return append(f.JSONYamlPrintFlags.AllowedFormats(), f.NamePrintFlags.AllowedFormats()...) + ret := []string{} + ret = append(ret, f.JSONYamlPrintFlags.AllowedFormats()...) + ret = append(ret, f.NamePrintFlags.AllowedFormats()...) + ret = append(ret, f.TemplatePrinterFlags.AllowedFormats()...) + return ret } func (f *PrintFlags) ToPrinter() (printers.ResourcePrinter, error) { @@ -76,6 +85,14 @@ func (f *PrintFlags) ToPrinter() (printers.ResourcePrinter, error) { if f.OutputFormat != nil { outputFormat = *f.OutputFormat } + // For backwards compatibility we want to support a --template argument given, even when no --output format is provided. + // If a default output format has been set, but no explicit output format has been provided via the --output flag, fallback + // to honoring the --template argument. + if f.TemplatePrinterFlags != nil && f.TemplatePrinterFlags.TemplateArgument != nil && + len(*f.TemplatePrinterFlags.TemplateArgument) > 0 && + (len(outputFormat) == 0 || (f.outputDefaulted && !f.outputFlag.Changed)) { + outputFormat = "go-template" + } if f.JSONYamlPrintFlags != nil { if p, err := f.JSONYamlPrintFlags.ToPrinter(outputFormat); !IsNoCompatiblePrinterError(err) { @@ -89,21 +106,30 @@ func (f *PrintFlags) ToPrinter() (printers.ResourcePrinter, error) { } } + if f.TemplatePrinterFlags != nil { + if p, err := f.TemplatePrinterFlags.ToPrinter(outputFormat); !IsNoCompatiblePrinterError(err) { + return f.TypeSetterPrinter.WrapToPrinter(p, err) + } + } + return nil, NoCompatiblePrinterError{OutputFormat: f.OutputFormat, AllowedFormats: f.AllowedFormats()} } func (f *PrintFlags) AddFlags(cmd *cobra.Command) { f.JSONYamlPrintFlags.AddFlags(cmd) f.NamePrintFlags.AddFlags(cmd) + f.TemplatePrinterFlags.AddFlags(cmd) if f.OutputFormat != nil { cmd.Flags().StringVarP(f.OutputFormat, "output", "o", *f.OutputFormat, fmt.Sprintf("Output format. One of: %s.", strings.Join(f.AllowedFormats(), "|"))) + f.outputFlag = cmd.Flag("output") } } // WithDefaultOutput sets a default output format if one is not provided through a flag value func (f *PrintFlags) WithDefaultOutput(output string) *PrintFlags { f.OutputFormat = &output + f.outputDefaulted = true return f } @@ -119,7 +145,8 @@ func NewPrintFlags(operation string) *PrintFlags { return &PrintFlags{ OutputFormat: &outputFormat, - JSONYamlPrintFlags: NewJSONYamlPrintFlags(), - NamePrintFlags: NewNamePrintFlags(operation), + JSONYamlPrintFlags: NewJSONYamlPrintFlags(), + NamePrintFlags: NewNamePrintFlags(operation), + TemplatePrinterFlags: NewKubeTemplatePrintFlags(), } } diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/BUILD b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/BUILD index c29044dc6391..ab491328c94f 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/BUILD @@ -6,8 +6,10 @@ go_library( "discard.go", "interface.go", "json.go", + "jsonpath.go", "name.go", "sourcechecker.go", + "template.go", "typesetter.go", ], importpath = "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers", @@ -18,13 +20,21 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//staging/src/k8s.io/client-go/util/jsonpath:go_default_library", ], ) go_test( name = "go_default_test", - srcs = ["sourcechecker_test.go"], + srcs = [ + "sourcechecker_test.go", + "template_test.go", + ], embed = [":go_default_library"], + deps = [ + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + ], ) filegroup( diff --git a/vendor/k8s.io/kubernetes/pkg/printers/jsonpath.go b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/jsonpath.go similarity index 95% rename from vendor/k8s.io/kubernetes/pkg/printers/jsonpath.go rename to vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/jsonpath.go index b8ea553f513a..76ebb1563dd2 100644 --- a/vendor/k8s.io/kubernetes/pkg/printers/jsonpath.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/jsonpath.go @@ -25,7 +25,6 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/util/jsonpath" - "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" ) // exists returns true if it would be possible to call the index function @@ -119,8 +118,8 @@ func (j *JSONPathPrinter) PrintObj(obj runtime.Object, w io.Writer) error { // we use reflect.Indirect here in order to obtain the actual value from a pointer. // we need an actual value in order to retrieve the package path for an object. // using reflect.Indirect indiscriminately is valid here, as all runtime.Objects are supposed to be pointers. - if printers.InternalObjectPreventer.IsForbidden(reflect.Indirect(reflect.ValueOf(obj)).Type().PkgPath()) { - return fmt.Errorf(printers.InternalObjectPrinterErr) + if InternalObjectPreventer.IsForbidden(reflect.Indirect(reflect.ValueOf(obj)).Type().PkgPath()) { + return fmt.Errorf(InternalObjectPrinterErr) } var queryObj interface{} = obj diff --git a/vendor/k8s.io/kubernetes/pkg/printers/template.go b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/template.go similarity index 95% rename from vendor/k8s.io/kubernetes/pkg/printers/template.go rename to vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/template.go index b28e184b9392..c96e0e847fec 100644 --- a/vendor/k8s.io/kubernetes/pkg/printers/template.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/template.go @@ -25,7 +25,6 @@ import ( "text/template" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" ) // TemplatePrinter is an implementation of ResourcePrinter which formats data with a Go Template. @@ -62,6 +61,10 @@ func (p *TemplatePrinter) AfterPrint(w io.Writer, res string) error { // PrintObj formats the obj with the Go Template. func (p *TemplatePrinter) PrintObj(obj runtime.Object, w io.Writer) error { + if InternalObjectPreventer.IsForbidden(reflect.Indirect(reflect.ValueOf(obj)).Type().PkgPath()) { + return fmt.Errorf(InternalObjectPrinterErr) + } + var data []byte var err error data, err = json.Marshal(obj) @@ -149,8 +152,8 @@ func (p *GoTemplatePrinter) AllowMissingKeys(allow bool) { // PrintObj formats the obj with the Go Template. func (p *GoTemplatePrinter) PrintObj(obj runtime.Object, w io.Writer) error { - if printers.InternalObjectPreventer.IsForbidden(reflect.Indirect(reflect.ValueOf(obj)).Type().PkgPath()) { - return fmt.Errorf(printers.InternalObjectPrinterErr) + if InternalObjectPreventer.IsForbidden(reflect.Indirect(reflect.ValueOf(obj)).Type().PkgPath()) { + return fmt.Errorf(InternalObjectPrinterErr) } var data []byte diff --git a/vendor/k8s.io/kubernetes/pkg/printers/template_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/template_test.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/printers/template_test.go rename to vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers/template_test.go diff --git a/vendor/k8s.io/kubernetes/pkg/printers/template_flags.go b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/template_flags.go similarity index 91% rename from vendor/k8s.io/kubernetes/pkg/printers/template_flags.go rename to vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/template_flags.go index ffd7a24dca62..f090f0976896 100644 --- a/vendor/k8s.io/kubernetes/pkg/printers/template_flags.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/template_flags.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package printers +package genericclioptions import ( "fmt" @@ -22,8 +22,7 @@ import ( "strings" "github.com/spf13/cobra" - - "k8s.io/kubernetes/pkg/kubectl/genericclioptions" + "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" ) // templates are logically optional for specifying a format. @@ -57,9 +56,9 @@ func (f *GoTemplatePrintFlags) AllowedFormats() []string { // ToPrinter receives an templateFormat and returns a printer capable of // handling --template format printing. // Returns false if the specified templateFormat does not match a template format. -func (f *GoTemplatePrintFlags) ToPrinter(templateFormat string) (ResourcePrinter, error) { +func (f *GoTemplatePrintFlags) ToPrinter(templateFormat string) (printers.ResourcePrinter, error) { if (f.TemplateArgument == nil || len(*f.TemplateArgument) == 0) && len(templateFormat) == 0 { - return nil, genericclioptions.NoCompatiblePrinterError{Options: f, OutputFormat: &templateFormat} + return nil, NoCompatiblePrinterError{Options: f, OutputFormat: &templateFormat} } templateValue := "" @@ -78,7 +77,7 @@ func (f *GoTemplatePrintFlags) ToPrinter(templateFormat string) (ResourcePrinter } if _, supportedFormat := templateFormats[templateFormat]; !supportedFormat { - return nil, genericclioptions.NoCompatiblePrinterError{OutputFormat: &templateFormat, AllowedFormats: f.AllowedFormats()} + return nil, NoCompatiblePrinterError{OutputFormat: &templateFormat, AllowedFormats: f.AllowedFormats()} } if len(templateValue) == 0 { @@ -94,7 +93,7 @@ func (f *GoTemplatePrintFlags) ToPrinter(templateFormat string) (ResourcePrinter templateValue = string(data) } - p, err := NewGoTemplatePrinter([]byte(templateValue)) + p, err := printers.NewGoTemplatePrinter([]byte(templateValue)) if err != nil { return nil, fmt.Errorf("error parsing template %s, %v\n", templateValue, err) } diff --git a/vendor/k8s.io/kubernetes/pkg/printers/template_flags_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/template_flags_test.go similarity index 95% rename from vendor/k8s.io/kubernetes/pkg/printers/template_flags_test.go rename to vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/template_flags_test.go index 3a2400ca8796..e1f5ae60e5c5 100644 --- a/vendor/k8s.io/kubernetes/pkg/printers/template_flags_test.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/genericclioptions/template_flags_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package printers +package genericclioptions import ( "bytes" @@ -26,7 +26,6 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/kubectl/genericclioptions" ) func TestPrinterSupportsExpectedTemplateFormats(t *testing.T) { @@ -105,12 +104,12 @@ func TestPrinterSupportsExpectedTemplateFormats(t *testing.T) { p, err := printFlags.ToPrinter(tc.outputFormat) if tc.expectNoMatch { - if !genericclioptions.IsNoCompatiblePrinterError(err) { + if !IsNoCompatiblePrinterError(err) { t.Fatalf("expected no printer matches for output format %q", tc.outputFormat) } return } - if genericclioptions.IsNoCompatiblePrinterError(err) { + if IsNoCompatiblePrinterError(err) { t.Fatalf("expected to match template printer for output format %q", tc.outputFormat) } @@ -178,7 +177,7 @@ func TestTemplatePrinterDefaultsAllowMissingKeysToTrue(t *testing.T) { outputFormat := "template" p, err := printFlags.ToPrinter(outputFormat) - if genericclioptions.IsNoCompatiblePrinterError(err) { + if IsNoCompatiblePrinterError(err) { t.Fatalf("expected to match template printer for output format %q", outputFormat) } if err != nil { diff --git a/vendor/k8s.io/kubernetes/pkg/printers/BUILD b/vendor/k8s.io/kubernetes/pkg/printers/BUILD index 1b2d8c111b9e..4694913474c7 100644 --- a/vendor/k8s.io/kubernetes/pkg/printers/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/printers/BUILD @@ -13,9 +13,6 @@ go_library( "customcolumn_flags.go", "humanreadable.go", "interface.go", - "jsonpath.go", - "jsonpath_flags.go", - "kube_template_flags.go", "tabwriter.go", "template.go", "template_flags.go", @@ -61,9 +58,6 @@ go_test( "customcolumn_flags_test.go", "customcolumn_test.go", "humanreadable_test.go", - "jsonpath_flags_test.go", - "template_flags_test.go", - "template_test.go", ], embed = [":go_default_library"], deps = [ diff --git a/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers_test.go b/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers_test.go index ee612d19cc2c..7b05326052d4 100644 --- a/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers_test.go +++ b/vendor/k8s.io/kubernetes/pkg/printers/internalversion/printers_test.go @@ -337,7 +337,7 @@ func TestUnknownTypePrinting(t *testing.T) { func TestTemplatePanic(t *testing.T) { tmpl := `{{and ((index .currentState.info "foo").state.running.startedAt) .currentState.info.net.state.running.startedAt}}` - printer, err := printers.NewGoTemplatePrinter([]byte(tmpl)) + printer, err := genericprinters.NewGoTemplatePrinter([]byte(tmpl)) if err != nil { t.Fatalf("tmpl fail: %v", err) } @@ -502,7 +502,7 @@ func TestTemplateStrings(t *testing.T) { } // The point of this test is to verify that the below template works. tmpl := `{{if (exists . "status" "containerStatuses")}}{{range .status.containerStatuses}}{{if (and (eq .name "foo") (exists . "state" "running"))}}true{{end}}{{end}}{{end}}` - printer, err := printers.NewGoTemplatePrinter([]byte(tmpl)) + printer, err := genericprinters.NewGoTemplatePrinter([]byte(tmpl)) if err != nil { t.Fatalf("tmpl fail: %v", err) } @@ -534,17 +534,17 @@ func TestPrinters(t *testing.T) { jsonpathPrinter printers.ResourcePrinter ) - templatePrinter, err = printers.NewGoTemplatePrinter([]byte("{{.name}}")) + templatePrinter, err = genericprinters.NewGoTemplatePrinter([]byte("{{.name}}")) if err != nil { t.Fatal(err) } - templatePrinter2, err = printers.NewGoTemplatePrinter([]byte("{{len .items}}")) + templatePrinter2, err = genericprinters.NewGoTemplatePrinter([]byte("{{len .items}}")) if err != nil { t.Fatal(err) } - jsonpathPrinter, err = printers.NewJSONPathPrinter("{.metadata.name}") + jsonpathPrinter, err = genericprinters.NewJSONPathPrinter("{.metadata.name}") if err != nil { t.Fatal(err) } diff --git a/vendor/k8s.io/kubernetes/pkg/printers/printers.go b/vendor/k8s.io/kubernetes/pkg/printers/printers.go index 32d90fdd26e0..239df465aa1d 100644 --- a/vendor/k8s.io/kubernetes/pkg/printers/printers.go +++ b/vendor/k8s.io/kubernetes/pkg/printers/printers.go @@ -22,6 +22,7 @@ import ( "os" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers" ) // GetStandardPrinter takes a format type, an optional format argument. It will return @@ -50,7 +51,7 @@ func GetStandardPrinter(typer runtime.ObjectTyper, encoder runtime.Encoder, deco if len(formatArgument) == 0 { return nil, fmt.Errorf("template format specified but no template given") } - templatePrinter, err := NewTemplatePrinter([]byte(formatArgument)) + templatePrinter, err := printers.NewTemplatePrinter([]byte(formatArgument)) if err != nil { return nil, fmt.Errorf("error parsing template %s, %v\n", formatArgument, err) } @@ -65,7 +66,7 @@ func GetStandardPrinter(typer runtime.ObjectTyper, encoder runtime.Encoder, deco if err != nil { return nil, fmt.Errorf("error reading template %s, %v\n", formatArgument, err) } - templatePrinter, err := NewTemplatePrinter(data) + templatePrinter, err := printers.NewTemplatePrinter(data) if err != nil { return nil, fmt.Errorf("error parsing template %s, %v\n", string(data), err) } @@ -76,7 +77,7 @@ func GetStandardPrinter(typer runtime.ObjectTyper, encoder runtime.Encoder, deco if len(formatArgument) == 0 { return nil, fmt.Errorf("jsonpath template format specified but no template given") } - jsonpathPrinter, err := NewJSONPathPrinter(formatArgument) + jsonpathPrinter, err := printers.NewJSONPathPrinter(formatArgument) if err != nil { return nil, fmt.Errorf("error parsing jsonpath %s, %v\n", formatArgument, err) } @@ -91,7 +92,7 @@ func GetStandardPrinter(typer runtime.ObjectTyper, encoder runtime.Encoder, deco if err != nil { return nil, fmt.Errorf("error reading template %s, %v\n", formatArgument, err) } - jsonpathPrinter, err := NewJSONPathPrinter(string(data)) + jsonpathPrinter, err := printers.NewJSONPathPrinter(string(data)) if err != nil { return nil, fmt.Errorf("error parsing template %s, %v\n", string(data), err) }