Skip to content

Commit

Permalink
Fix validation errors in plugin documentation
Browse files Browse the repository at this point in the history
This fixes validation errors in plugin documentation now that ansible
test for 2.13 is running validate-modules on all plugins. The kubectl
connection plugin validation is ignored because there seems to be a
requirement for the author field to have a github username, which we do
not have.

Signed-off-by: Abhijeet Kasurde <[email protected]>
  • Loading branch information
gravesm authored and Akasurde committed Mar 8, 2022
1 parent 73499d9 commit 5893d9e
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 54 deletions.
4 changes: 2 additions & 2 deletions plugins/connection/kubectl.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

DOCUMENTATION = r"""
author:
- xuxinkun
- xuxinkun (@xuxinkun)
connection: kubectl
name: kubectl
short_description: Execute tasks in pods running on Kubernetes.
Expand Down
5 changes: 2 additions & 3 deletions plugins/inventory/k8s.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@

DOCUMENTATION = """
name: k8s
plugin_type: inventory
author:
- Chris Houseknecht <@chouseknecht>
- Fabian von Feilitzsch <@fabianvf>
- Chris Houseknecht (@chouseknecht)
- Fabian von Feilitzsch (@fabianvf)
short_description: Kubernetes (K8s) inventory source
Expand Down
41 changes: 16 additions & 25 deletions plugins/lookup/k8s.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
__metaclass__ = type

DOCUMENTATION = """
lookup: k8s
name: k8s
short_description: Query the K8s API
author:
- Chris Houseknecht <@chouseknecht>
- Fabian von Feilitzsch <@fabianvf>
- Chris Houseknecht (@chouseknecht)
- Fabian von Feilitzsch (@fabianvf)
description:
- Uses the Kubernetes Python client to fetch a specific object by name, all matching objects within a
Expand Down Expand Up @@ -159,28 +159,19 @@
_list:
description:
- One ore more object definitions returned from the API.
type: complex
contains:
api_version:
description: The versioned schema of this representation of an object.
returned: success
type: str
kind:
description: Represents the REST resource this object represents.
returned: success
type: str
metadata:
description: Standard object metadata. Includes name, namespace, annotations, labels, etc.
returned: success
type: complex
spec:
description: Specific attributes of the object. Will vary based on the I(api_version) and I(kind).
returned: success
type: complex
status:
description: Current status details for the object.
returned: success
type: complex
type: list
elements: dict
sample:
- kind: ConfigMap
apiVersion: v1
metadata:
creationTimestamp: "2022-03-04T13:59:49Z"
name: my-config-map
namespace: default
resourceVersion: "418"
uid: 5714b011-d090-4eac-8272-a0ea82ec0abd
data:
key1: val1
"""

import os
Expand Down
35 changes: 11 additions & 24 deletions plugins/lookup/kustomize.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

DOCUMENTATION = """
lookup: kustomize
name: kustomize
short_description: Build a set of kubernetes resources using a 'kustomization.yaml' file.
version_added: "2.2.0"
author:
- Aubin Bikouo <@abikouo>
- Aubin Bikouo (@abikouo)
notes:
- If both kustomize and kubectl are part of the PATH, kustomize will be used by the plugin.
description:
Expand Down Expand Up @@ -52,29 +52,16 @@
RETURN = """
_list:
description:
- One ore more object definitions returned from the tool execution.
type: complex
contains:
api_version:
description: The versioned schema of this representation of an object.
returned: success
type: str
kind:
description: Represents the REST resource this object represents.
returned: success
type: str
- YAML string for the object definitions returned from the tool execution.
type: str
sample:
kind: ConfigMap
apiVersion: v1
metadata:
description: Standard object metadata. Includes name, namespace, annotations, labels, etc.
returned: success
type: complex
spec:
description: Specific attributes of the object. Will vary based on the I(api_version) and I(kind).
returned: success
type: complex
status:
description: Current status details for the object.
returned: success
type: complex
name: my-config-map
namespace: default
data:
key1: val1
"""

from ansible.errors import AnsibleLookupError
Expand Down

0 comments on commit 5893d9e

Please sign in to comment.