diff --git a/mylimbo-ansible-collections-global/workflowTemplates/mylimbo-ansible-collections-global-script.yaml b/mylimbo-ansible-collections-global/workflowTemplates/mylimbo-ansible-collections-global-script.yaml index d22bc21..3dfdd8d 100644 --- a/mylimbo-ansible-collections-global/workflowTemplates/mylimbo-ansible-collections-global-script.yaml +++ b/mylimbo-ansible-collections-global/workflowTemplates/mylimbo-ansible-collections-global-script.yaml @@ -27,7 +27,7 @@ spec: - name: ANSIBLE_BECOME_PASS valueFrom: secretKeyRef: - name: ansible_secrets + name: "{{ inputs.parameters.ansible_secret_name }}" key: ansible_become_password resources: limits: @@ -41,10 +41,10 @@ spec: - name: inventory mountPath: /workspace/inventory subPath: inventory - - name: ansible_secrets + - name: ansible-secrets mountPath: /workspace/secrets/vault-pass.txt subPath: vault-pass.txt - - name: ssh_secrets + - name: ssh-secrets mountPath: /home/ansible/.ssh volumes: - name: inventory @@ -52,10 +52,10 @@ spec: reference: "{{ inputs.parameters.inventory_image_reference }}" pullPolicy: Always - - name: ansible_secrets + - name: ansible-secrets secret: secretName: "{{ inputs.parameters.ansible_secret_name }}" - - name: ssh_secrets + - name: ssh-secrets secret: secretName: "{{ inputs.parameters.ssh_secret_name }}" diff --git a/nodes-mngt/icarus-nodes-mngt/kustomization.yaml b/nodes-mngt/icarus-nodes-mngt/kustomization.yaml index 935f46d..b4a4b12 100644 --- a/nodes-mngt/icarus-nodes-mngt/kustomization.yaml +++ b/nodes-mngt/icarus-nodes-mngt/kustomization.yaml @@ -1,9 +1,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: icarus-nodes-mngt resources: - infra - cronWorkflows - workflowTemplates + - ../../mylimbo-ansible-collections-global generatorOptions: disableNameSuffixHash: true diff --git a/nodes-mngt/icarus-nodes-mngt/workflowTemplates/icarus-ansible-script.yaml b/nodes-mngt/icarus-nodes-mngt/workflowTemplates/icarus-ansible-script.yaml index d13d3c2..6a9b9c3 100644 --- a/nodes-mngt/icarus-nodes-mngt/workflowTemplates/icarus-ansible-script.yaml +++ b/nodes-mngt/icarus-nodes-mngt/workflowTemplates/icarus-ansible-script.yaml @@ -11,17 +11,17 @@ spec: serviceAccountName: argo-runner imagePullSecrets: - name: oci-mylimbo-infra-icarus-credentials - entrypoint: exec + entrypoint: raw-source templates: - - name: exec + - name: raw-source inputs: parameters: - name: source steps: - - - name: script-exec + - - name: invoke-limbo-ansible-collections-global templateRef: - name: limbo-ansible-collections-global + name: mylimbo-ansible-collections-global template: raw-source arguments: parameters: