Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ you can specify many default contexts in the environment.
### Defaults when invoking `oc`
Establishing explicit contexts within an application will override these environment defaults.
- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_OC_PATH` - default path to use when invoking `oc`
- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CONFIG_PATH` - default `--config` argument
- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CONFIG_PATH` - default `--kubeconfig` argument
- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_API_SERVER` - default `--server` argument
- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_CA_CERT_PATH` - default `--cacert` argument
- `OPENSHIFT_CLIENT_PYTHON_DEFAULT_PROJECT` - default `--namespace` argument
Expand Down
2 changes: 1 addition & 1 deletion ansible/rebuild_module.digest
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7117af22373867e9f3ec3c0964ccd0ee -
2ddbee21a5c0456525d2fb662a4f1b01 -

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/openshift/action.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def oc_action(context, verb, cmd_args=None, all_namespaces=False, no_namespace=F
references = {}

if context.get_kubeconfig_path() is not None:
cmds.append("--config=%s" % context.get_kubeconfig_path())
cmds.append("--kubeconfig=%s" % context.get_kubeconfig_path())

if context.get_api_url() is not None:
url = context.get_api_url()
Expand Down
2 changes: 1 addition & 1 deletion packages/openshift/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ def api_server(api_url=None, ca_cert_path=None, kubeconfig_path=None):
Contexts can be nested. The most immediate ancestor cluster context
will define the API server targeted by an action.
:param api_url: The oc --server argument to use.
:param kubeconfig_path: The oc --config argument to use.
:param kubeconfig_path: The oc --kubeconfig argument to use.
:return: The context object. Can be safely ignored.
"""

Expand Down