From 6e644f374ef94fdc117bf1dd16362863a7b2bca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= Date: Tue, 20 Oct 2026 20:26:05 +0000 Subject: [PATCH] icarus mng start using tbot --- ....json => oci_registry_secret.example.json} | 0 .../icarus-mngt/secrets/kustomization.yaml | 9 ++---- .../cronWorkflows/crictl-prune.yaml | 7 ++--- .../icarus-ansible-script.yaml | 16 ++-------- icarus-mngt/workflows/nodes-get-info.yml | 6 ++-- icarus-mngt/workflows/nodes-update-os.yml | 4 ++- ...nsible-collections-global-tbot-script.yaml | 30 +++++++++++++++++++ 7 files changed, 45 insertions(+), 27 deletions(-) rename deploy/flux/icarus-mngt/secrets/.env.d/{oci-registry-secret.example.json => oci_registry_secret.example.json} (100%) create mode 100644 icarus-mngt/workflows/tests-mylimbo-ansible-collections-global-tbot-script.yaml diff --git a/deploy/flux/icarus-mngt/secrets/.env.d/oci-registry-secret.example.json b/deploy/flux/icarus-mngt/secrets/.env.d/oci_registry_secret.example.json similarity index 100% rename from deploy/flux/icarus-mngt/secrets/.env.d/oci-registry-secret.example.json rename to deploy/flux/icarus-mngt/secrets/.env.d/oci_registry_secret.example.json diff --git a/deploy/flux/icarus-mngt/secrets/kustomization.yaml b/deploy/flux/icarus-mngt/secrets/kustomization.yaml index 02c1d90..1030a96 100644 --- a/deploy/flux/icarus-mngt/secrets/kustomization.yaml +++ b/deploy/flux/icarus-mngt/secrets/kustomization.yaml @@ -2,19 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: icarus-nodes-mngt secretGenerator: - - name: icarus-ssh - files: - - known_hosts=.env.d/icarus-known_hosts - - id_rsa=.env.d/icarus-ssh-ansible-id_rsa - - id_rsa.pub=.env.d/icarus-ssh-ansible-id_rsa.pub - name: icarus-ansible files: - - vault_password=.env.d/ansible_vault_password + - ansible_vault_password=.env.d/ansible_vault_password - ansible_become_password=.env.d/ansible_become_password - name: oci-registry-secret type: kubernetes.io/dockerconfigjson files: - - .dockerconfigjson=.env.d/oci-registry-secret.json + - .dockerconfigjson=.env.d/oci_registry_secret.json generatorOptions: disableNameSuffixHash: true diff --git a/deploy/icarus-mngt/cronWorkflows/crictl-prune.yaml b/deploy/icarus-mngt/cronWorkflows/crictl-prune.yaml index 7aac02e..0abf01b 100644 --- a/deploy/icarus-mngt/cronWorkflows/crictl-prune.yaml +++ b/deploy/icarus-mngt/cronWorkflows/crictl-prune.yaml @@ -10,11 +10,10 @@ spec: successfulJobsHistoryLimit: 3 failedJobsHistoryLimit: 5 workflowSpec: - entrypoint: exec - serviceAccountName: argo-runner imagePullSecrets: - - name: oci-mylimbo-infra-icarus-credentials - + - name: oci-registry-secret + serviceAccountName: argo-runner + entrypoint: exec templates: - name: exec steps: diff --git a/deploy/icarus-mngt/workflowTemplates/icarus-ansible-script.yaml b/deploy/icarus-mngt/workflowTemplates/icarus-ansible-script.yaml index 03e341d..deac0ba 100644 --- a/deploy/icarus-mngt/workflowTemplates/icarus-ansible-script.yaml +++ b/deploy/icarus-mngt/workflowTemplates/icarus-ansible-script.yaml @@ -8,18 +8,6 @@ metadata: workflows.argoproj.io/description: | icarus ansible script spec: - serviceAccountName: argo-runner - imagePullSecrets: - - name: oci-registry-secret - - # path set ssh / teleport domain - podSpecPatch: | - containers: - - name: main - env: - - name: SSH_DOMAIN - value: teleport.limbosolutions.com - entrypoint: raw-source templates: - name: raw-source @@ -40,4 +28,6 @@ spec: - name: inventory_image_reference value: oci.limbosolutions.com/mylimbo.infra.icarus/ansible-inventory:latest - name: ansible_secret_name - value: "icarus-ansible" + value: icarus-ansible + - name: ssh_domain + value: teleport.limbosolutions.com \ No newline at end of file diff --git a/icarus-mngt/workflows/nodes-get-info.yml b/icarus-mngt/workflows/nodes-get-info.yml index 8f2f466..9885563 100644 --- a/icarus-mngt/workflows/nodes-get-info.yml +++ b/icarus-mngt/workflows/nodes-get-info.yml @@ -4,14 +4,16 @@ metadata: generateName: node-get-info- namespace: icarus-nodes-mngt spec: - entrypoint: exec + imagePullSecrets: + - name: oci-registry-secret serviceAccountName: argo-runner + + entrypoint: exec templates: - name: exec steps: - - name: script-exec templateRef: - # https://git.limbosolutions.com/myLimbo/myinfra.kubernetes.shared name: icarus-ansible-script template: raw-source arguments: diff --git a/icarus-mngt/workflows/nodes-update-os.yml b/icarus-mngt/workflows/nodes-update-os.yml index f064b8c..42bec94 100644 --- a/icarus-mngt/workflows/nodes-update-os.yml +++ b/icarus-mngt/workflows/nodes-update-os.yml @@ -4,8 +4,10 @@ metadata: generateName: nodes-update-os- namespace: icarus-nodes-mngt spec: - entrypoint: exec + imagePullSecrets: + - name: oci-registry-secret serviceAccountName: argo-runner + entrypoint: exec templates: - name: exec steps: diff --git a/icarus-mngt/workflows/tests-mylimbo-ansible-collections-global-tbot-script.yaml b/icarus-mngt/workflows/tests-mylimbo-ansible-collections-global-tbot-script.yaml new file mode 100644 index 0000000..b5016ab --- /dev/null +++ b/icarus-mngt/workflows/tests-mylimbo-ansible-collections-global-tbot-script.yaml @@ -0,0 +1,30 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Workflow +metadata: + namespace: icarus-nodes-mngt + generateName: tests-mylimbo-ansible-collections-global-tbot-script- + +spec: + imagePullSecrets: + - name: oci-registry-secret + entrypoint: exec + serviceAccountName: argo-runner + templates: + - name: exec + steps: + - - name: script-exec + templateRef: + name: mylimbo-ansible-collections-global-tbot + template: raw-source + arguments: + parameters: + - name: tbot_configmap_name + value: icarus-nodes-mngt-tbot-config + - name: inventory_image_reference + value: oci.limbosolutions.com/mylimbo.infra.icarus/ansible-inventory:latest + - name: ansible_secret_name + value: "icarus-ansible" + - name: source + value: | + ansible-playbook mylimbo.globals.host_maintenance.os_info +