From da7c9dc67553f837b2ea95fc53038efd204040ce Mon Sep 17 00:00:00 2001 From: Moshe Immermam Date: Sun, 1 Dec 2024 14:07:44 +0200 Subject: [PATCH] fix: kubernetes playbooks with agents --- .../playbooks-kubernetes/templates/create-deployment.yaml | 2 ++ charts/playbooks-kubernetes/templates/delete.yaml | 3 +++ .../playbooks-kubernetes/templates/deploy-helm-chart.yaml | 8 ++++++-- charts/playbooks-kubernetes/templates/ignore.yaml | 3 +++ charts/playbooks-kubernetes/templates/pod-snapshot.yaml | 3 +++ .../templates/request-namespace-access.yaml | 3 +++ charts/playbooks-kubernetes/templates/restart.yaml | 3 +++ charts/playbooks-kubernetes/templates/scale.yaml | 3 +++ charts/playbooks-kubernetes/templates/update-image.yaml | 3 +++ .../playbooks-kubernetes/templates/update-resource.yaml | 2 ++ 10 files changed, 31 insertions(+), 2 deletions(-) diff --git a/charts/playbooks-kubernetes/templates/create-deployment.yaml b/charts/playbooks-kubernetes/templates/create-deployment.yaml index a312366..ec39690 100644 --- a/charts/playbooks-kubernetes/templates/create-deployment.yaml +++ b/charts/playbooks-kubernetes/templates/create-deployment.yaml @@ -22,6 +22,8 @@ spec: - agent: all types: - Kubernetes::Namespace + runsOn: + - {{` "{{- if .agent }}{{.agent.id}}{{ else }}local{{ end }}" `}} actions: - name: Create Deployment exec: diff --git a/charts/playbooks-kubernetes/templates/delete.yaml b/charts/playbooks-kubernetes/templates/delete.yaml index 33a7048..567c246 100644 --- a/charts/playbooks-kubernetes/templates/delete.yaml +++ b/charts/playbooks-kubernetes/templates/delete.yaml @@ -11,6 +11,9 @@ spec: icon: trash category: Kubernetes description: Deletes the resource + runsOn: + - {{` "{{- if .agent }}{{.agent.id}}{{ else }}local{{ end }}" `}} + configs: - agent: all types: diff --git a/charts/playbooks-kubernetes/templates/deploy-helm-chart.yaml b/charts/playbooks-kubernetes/templates/deploy-helm-chart.yaml index 45b4275..454666b 100644 --- a/charts/playbooks-kubernetes/templates/deploy-helm-chart.yaml +++ b/charts/playbooks-kubernetes/templates/deploy-helm-chart.yaml @@ -25,8 +25,12 @@ spec: type: code configs: - - types: + - agent: all + types: - Kubernetes::Namespace + runsOn: + - {{` "{{- if .agent }}{{.agent.id}}{{ else }}local{{ end }}" `}} + actions: - name: Create Deployment exec: @@ -34,5 +38,5 @@ spec: # gotemplate: left-delim=$[[ right-delim=]] helm repo add $[[.params.chart]] $[[.params.repo]] helm repo update - helm install $[[.params.chart]] -n $[[.config.name]] + helm install $[[.params.chart]] $[[.params.repo]]/$[[.params.chart]] -n $[[.config.name]] {{- end}} diff --git a/charts/playbooks-kubernetes/templates/ignore.yaml b/charts/playbooks-kubernetes/templates/ignore.yaml index 1e82314..c5efbde 100644 --- a/charts/playbooks-kubernetes/templates/ignore.yaml +++ b/charts/playbooks-kubernetes/templates/ignore.yaml @@ -6,6 +6,9 @@ kind: Playbook metadata: name: kubernetes-ignore-changes spec: + runsOn: + - {{` "{{- if .agent }}{{.agent.id}}{{ else }}local{{ end }}" `}} + actions: - exec: script: | diff --git a/charts/playbooks-kubernetes/templates/pod-snapshot.yaml b/charts/playbooks-kubernetes/templates/pod-snapshot.yaml index 317969c..cd7d46d 100644 --- a/charts/playbooks-kubernetes/templates/pod-snapshot.yaml +++ b/charts/playbooks-kubernetes/templates/pod-snapshot.yaml @@ -15,6 +15,9 @@ spec: - agent: all types: - Kubernetes::Pod + runsOn: + - {{` "{{- if .agent }}{{.agent.id}}{{ else }}local{{ end }}" `}} + actions: - name: Take snapshot exec: diff --git a/charts/playbooks-kubernetes/templates/request-namespace-access.yaml b/charts/playbooks-kubernetes/templates/request-namespace-access.yaml index 1d7f65b..a9cbde2 100644 --- a/charts/playbooks-kubernetes/templates/request-namespace-access.yaml +++ b/charts/playbooks-kubernetes/templates/request-namespace-access.yaml @@ -44,6 +44,9 @@ spec: - agent: all types: - Kubernetes::Namespace + runsOn: + - {{` "{{- if .agent }}{{.agent.id}}{{ else }}local{{ end }}" `}} + actions: - name: Create RoleBinding exec: diff --git a/charts/playbooks-kubernetes/templates/restart.yaml b/charts/playbooks-kubernetes/templates/restart.yaml index 7bc2d37..9fcf488 100644 --- a/charts/playbooks-kubernetes/templates/restart.yaml +++ b/charts/playbooks-kubernetes/templates/restart.yaml @@ -17,6 +17,9 @@ spec: - Kubernetes::Statefulset - Kubernetes::DaemonSet + runsOn: + - {{` "{{- if .agent }}{{.agent.id}}{{ else }}local{{ end }}" `}} + actions: - name: Restart exec: diff --git a/charts/playbooks-kubernetes/templates/scale.yaml b/charts/playbooks-kubernetes/templates/scale.yaml index 85de4ed..c31af7b 100644 --- a/charts/playbooks-kubernetes/templates/scale.yaml +++ b/charts/playbooks-kubernetes/templates/scale.yaml @@ -20,6 +20,9 @@ spec: label: Replicas type: text default: "$(.config.config.spec.replicas)" + runsOn: + - {{` "{{- if .agent }}{{.agent.id}}{{ else }}local{{ end }}" `}} + actions: - name: Scale resource exec: diff --git a/charts/playbooks-kubernetes/templates/update-image.yaml b/charts/playbooks-kubernetes/templates/update-image.yaml index aab3949..5d429b5 100644 --- a/charts/playbooks-kubernetes/templates/update-image.yaml +++ b/charts/playbooks-kubernetes/templates/update-image.yaml @@ -25,6 +25,9 @@ spec: label: Image type: text default: '$( .config.config | jq ".spec.template.spec.containers[0].image" )' + runsOn: + - {{` "{{- if .agent }}{{.agent.id}}{{ else }}local{{ end }}" `}} + actions: - name: Update image exec: diff --git a/charts/playbooks-kubernetes/templates/update-resource.yaml b/charts/playbooks-kubernetes/templates/update-resource.yaml index 594dc99..4694497 100644 --- a/charts/playbooks-kubernetes/templates/update-resource.yaml +++ b/charts/playbooks-kubernetes/templates/update-resource.yaml @@ -42,6 +42,8 @@ spec: type: bytes default: '$( .config.config | jq ".spec.template.spec.containers[0].resources.limits.memory" | default "")' + runsOn: + - {{` "{{- if .agent }}{{.agent.id}}{{ else }}local{{ end }}" `}} actions: - name: Update Resource Requests and Limits