Commit Graph

26 Commits (6291efd4ea155902d7e0378a345890bc015ad082)

Author SHA1 Message Date
Mariusz Mazur a5c8e952e8 k8s_facts: fix handling of unknown resource types (#47857) 2018-11-06 14:43:55 +01:00
Will Thames 00ccad9764 Use kubeconfig if either context or kubeconfig is set (#47373)
kubeconfig should be loaded if *either* or both of context
or kubeconfig is set (this allows picking a context and default
kubeconfig or picking a kubeconfig with default context)

Fixes #47149
2018-10-23 07:53:22 +01:00
Will Thames b772485d97 Ensure that k8s_facts always returns resources key (#46733)
Fix bug returning `items` key if NotFound exception is hit
2018-10-12 05:11:48 -04:00
Will Thames 411397a975 Use recursive_diff for kubernetes (#45645)
Move recursive_diff from cloudfront_distribution to
common.dict_transformations and reuse it in k8s modules
2018-10-02 03:24:52 -04:00
Pilou 2fd18c77ae openshift inventory plugin: fix exception when auth fails (#45826)
* openshift inventory: fix exception when auth fails

Fix 'ForbiddenError' object has no attribute 'message':

    [WARNING]:  * Failed to parse test.yml with openshift plugin: 'ForbiddenError' object has no attribute 'message'
     File "ansible/lib/ansible/inventory/manager.py", line 270, in parse_source
       plugin.parse(self._inventory, self._loader, source, cache=cache)
     File "ansible/lib/ansible/plugins/inventory/openshift.py", line 122, in parse
       self.setup(config_data, cache, cache_key)
     File "ansible/lib/ansible/module_utils/k8s/inventory.py", line 58, in setup
       self.fetch_objects(connections)
     File "ansible/lib/ansible/module_utils/k8s/inventory.py", line 250, in fetch_objects
       super(OpenShiftInventoryHelper, self).fetch_objects(connections)
     File "ansible/lib/ansible/module_utils/k8s/inventory.py", line 81, in fetch_objects
       namespaces = self.get_available_namespaces(client)
     File "ansible/lib/ansible/module_utils/k8s/inventory.py", line 95, in get_available_namespaces
       raise K8sInventoryException('Error fetching Namespace list: {0}'.format(exc.message))

Don't try to get 'message' attribute from:
- K8sInventoryException instances
- Exception instances
- KubernetesException instances (because KubernetesException can be
  Exception)

* move k8s/OpenShift inventory plugin dedicated code

inventory plugin specific code should not be located in
lib/ansible/module_utils directory. Then ansible.utils methods can be
reused (for example Display).

* Remove unused class variables 'helper'

unused since 4d77878654.
2018-09-26 18:16:54 -04:00
Fabian von Feilitzsch aa01d9d243 Set defaults from params after loading files, allowing params to override (#44142)
* Set defaults from params after loading files, allowing params to override

* cleanup, add some comments
2018-09-10 15:30:59 -04:00
Will Thames b35ac8080f Change the return key of k8s_facts (#44446)
`items` is a *terrible* return key for ansible as Jinja
will often think it refers to the `items()` function.

Even though you can typically work around this with
`results['items']`, sometimes even that doesn't work:

```
- name: Resources should exist
  assert:
    that: item.status.phase == 'Active'
  loop: "{{ k8s_namespaces['items'] }}"
```

```
fatal: [testhost]: FAILED! => {"msg": "Invalid data passed to 'loop', it
requires a list, got this instead: <built-in method items of dict object
at 0x109dc9c58>. Hint: If you passed a list/dict of just one element,
try adding wantlist=True to your lookup invocation or use q/query
instead of lookup."}
```

Change it now while we still can.
2018-08-29 12:04:04 +01:00
Will Thames b8907ff09e
k8s_facts should not throw exceptions when not found (#44429)
Handle the case where a resource is not found by catching
the exception and returning an empty result set.
2018-08-28 12:51:26 +10:00
Joren Vrancken b954917761 Surround top-level function and class definitions with two blank lines. 2018-07-31 12:06:56 -07:00
Will Thames 0b77262288 Add merge_type parameter to k8s module (#42219)
Allows patching of custom Kubernetes resources that
don't support strategic merge patching

Check that openshift module supports content_type param
(requires version newer than 0.6.0)
2018-07-22 21:05:25 -07:00
Fabian von Feilitzsch 0421305254 Properly format API key when set in an enviroment variable (#42202) 2018-07-13 16:31:22 -04:00
Fabian von Feilitzsch e9c7b513a1 [k8s] allow user to pass list of resources in to definition parameter (#42377)
* allow user to pass list of resources in to definition parameter

* Add new validator for list|dict|string

* use string_types instead of string

* state/force information is lost after the first item in the list

* Add tests

* Appease ansibot
2018-07-09 08:33:16 -05:00
Fabian von Feilitzsch d75e49693b update module arguments to allow resource_definition to be a string (#40730) 2018-06-29 09:21:47 -05:00
Will Thames 895c512596 New k8s_facts module
Strip out the facts parts of the k8s module into a new simpler
module that deals with querying for facts, also allowing
field and label selectors
2018-06-25 17:05:20 -07:00
Fabian von Feilitzsch 4d77878654 K8s dynamic collected changes (#40745)
* Move k8s modules to dynamic backend

* update required openshift version

* update -> patch

* use new dynamic client exceptions

* style

* guard urllib3 import

* guard ansibleerror import

* give more information about error cause

* format in variable

* style

* rename tests

* Search for provided kind in a few more places to match old behavior, properly handle failure

* make common code use fail instead of fail_json, to work for lookup plugins as well

* update docs

* move openshift_raw tests into k8s tests

* fix typo

* Use diff of response and resource to determine change, don't do any checking client-side before making requests

* remove duplicate yaml blocks

* Update porting guide for k8s module

* remove invalid doc refs

* If fuzzy searching finds a resource, update resource_definition to match proper kind and version

* remote unsupported openshift_raw variables

* properly check environment variables when determining auth method:
2018-05-30 12:04:48 -05:00
Adam Miller 78023e79d7
Revert "Move k8s modules to dynamic backend (#39632)" (#40743)
This reverts commit 4373b155a5.
2018-05-26 00:30:16 -05:00
Fabian von Feilitzsch 4373b155a5 Move k8s modules to dynamic backend (#39632)
* Move k8s modules to dynamic backend
2018-05-16 10:57:36 -05:00
Pierre-Louis Bonicoli afef20827b openshift_raw & openshift_scale: fix broken import 2018-04-23 17:57:17 -07:00
Chris Houseknecht ac11027d58
Convert key to snake. Fixes #36845. (#36887) (#36904) 2018-03-01 10:03:32 -05:00
Chris Houseknecht 623ff39443
Separate common and raw (#34563) 2018-01-09 07:22:46 -05:00
Chris Houseknecht 85ff38d2e2
K8s lookup plugin (#34025)
* Use OpenShift client

* Refactored

* Fix lint issues

* Replace AnsibleError to make the bot happy

* Remove extra space
2018-01-04 15:24:31 -05:00
Chris Houseknecht d73be7f461
Remove diff and request data. Add more return docs. (#34230) 2017-12-25 21:50:58 -05:00
Chris Houseknecht 32f963aa0f
Prevent secret data from being logged (#34229) 2017-12-25 21:01:28 -05:00
Chris Houseknecht ec3c31b1f4
Fail when model not found (#34227) 2017-12-25 16:45:19 -05:00
Chris Houseknecht 54396a95c2
Adds datetime encoder. Fixes Service comparison. (#34223) 2017-12-25 12:09:31 -05:00
Chris Houseknecht 9b4a1ed475
Reorganize k8s common (#34212)
* Reorganize k8s common

* Separates AnsibleMixin

* Fix lint issues
2017-12-23 16:41:38 -05:00