From 2dc7c0fd018007dc29d5e0d2b37a9cf7faa46e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sun, 12 May 2024 16:56:36 +0200 Subject: [PATCH] fix --- share/tekton-tasks/all_Task.tf | 36 +++++++++++++++++----------------- share/tekton-tasks/common.tf | 13 ++++++++++++ 2 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 share/tekton-tasks/common.tf diff --git a/share/tekton-tasks/all_Task.tf b/share/tekton-tasks/all_Task.tf index b8e0d3f..c9a7e2f 100644 --- a/share/tekton-tasks/all_Task.tf +++ b/share/tekton-tasks/all_Task.tf @@ -4,7 +4,7 @@ resource "kubectl_manifest" "Task_python-coverage" { kind: Task metadata: name: python-coverage - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/categories: Code Quality tekton.dev/pipelines.minVersion: 0.12.1 @@ -62,7 +62,7 @@ resource "kubectl_manifest" "Task_npm" { kind: Task metadata: name: npm - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/pipelines.minVersion: 0.17.0 tekton.dev/categories: Build Tools @@ -110,7 +110,7 @@ resource "kubectl_manifest" "Task_pytest" { kind: Task metadata: name: pytest - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/categories: Testing tekton.dev/pipelines.minVersion: 0.17.0 @@ -190,7 +190,7 @@ resource "kubectl_manifest" "Task_shellcheck" { kind: Task metadata: name: shellcheck - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/pipelines.minVersion: 0.12.1 tekton.dev/categories: Code Quality @@ -227,7 +227,7 @@ resource "kubectl_manifest" "Task_markdown-lint" { kind: Task metadata: name: markdown-lint - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/pipelines.minVersion: 0.12.1 tekton.dev/categories: Code Quality @@ -264,7 +264,7 @@ resource "kubectl_manifest" "Task_black" { kind: Task metadata: name: black - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/pipelines.minVersion: 0.12.1 tekton.dev/categories: Code Quality @@ -312,7 +312,7 @@ resource "kubectl_manifest" "Task_kube-linter" { kind: Task metadata: name: kube-linter - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/pipelines.minVersion: 0.12.1 tekton.dev/categories: Code Quality @@ -404,7 +404,7 @@ resource "kubectl_manifest" "Task_yaml-lint" { kind: Task metadata: name: yaml-lint - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/pipelines.minVersion: 0.12.1 tekton.dev/categories: Code Quality @@ -441,7 +441,7 @@ resource "kubectl_manifest" "Task_buildpacks-phases" { kind: Task metadata: name: buildpacks-phases - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/categories: Image Build, Security tekton.dev/pipelines.minVersion: 0.17.0 @@ -676,7 +676,7 @@ resource "kubectl_manifest" "Task_sonarqube-scanner" { kind: Task metadata: name: sonarqube-scanner - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/deprecated: 'true' tekton.dev/pipelines.minVersion: 0.17.0 @@ -834,7 +834,7 @@ resource "kubectl_manifest" "Task_check-make" { kind: Task metadata: name: check-make - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/pipelines.minVersion: 0.12.1 tekton.dev/categories: Code Quality @@ -871,7 +871,7 @@ resource "kubectl_manifest" "Task_gitea-set-status" { kind: Task metadata: name: gitea-set-status - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/categories: Git tekton.dev/pipelines.minVersion: 0.12.1 @@ -1021,7 +1021,7 @@ resource "kubectl_manifest" "Task_hadolint" { tekton.dev/platforms: linux/amd64 tekton.dev/tags: Kubernetes, Misconfiguration name: hadolint - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} namespace: ${var.namespace} ownerReferences: ${jsonencode(var.install_owner)} spec: @@ -1076,7 +1076,7 @@ resource "kubectl_manifest" "Task_hugo" { kind: Task metadata: name: hugo - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/pipelines.minVersion: 0.12.1 tekton.dev/categories: Build Tools, Cloud @@ -1156,7 +1156,7 @@ resource "kubectl_manifest" "Task_buildah" { kind: Task metadata: name: buildah - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/categories: Image Build tekton.dev/pipelines.minVersion: 0.17.0 @@ -1249,7 +1249,7 @@ resource "kubectl_manifest" "Task_buildpacks" { kind: Task metadata: name: buildpacks - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/categories: Image Build tekton.dev/pipelines.minVersion: 0.17.0 @@ -1420,7 +1420,7 @@ resource "kubectl_manifest" "Task_kubeval" { kind: Task metadata: name: kubeval - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/pipelines.minVersion: 0.12.1 tekton.dev/categories: Code Quality, Kubernetes @@ -1462,7 +1462,7 @@ resource "kubectl_manifest" "Task_pylint" { kind: Task metadata: name: pylint - labels: ${jsonencode(local.common-labels)} + labels: ${jsonencode(local.common_labels)} annotations: tekton.dev/categories: Code Quality tekton.dev/pipelines.minVersion: 0.17.0 diff --git a/share/tekton-tasks/common.tf b/share/tekton-tasks/common.tf new file mode 100644 index 0000000..be31959 --- /dev/null +++ b/share/tekton-tasks/common.tf @@ -0,0 +1,13 @@ + +locals { + common_labels = { + "vynil.solidite.fr/owner-name" = var.instance + "vynil.solidite.fr/owner-namespace" = var.namespace + "vynil.solidite.fr/owner-category" = var.category + "vynil.solidite.fr/owner-component" = var.component + "app.kubernetes.io/managed-by" = "vynil" + "app.kubernetes.io/name" = var.component + "app.kubernetes.io/instance" = var.instance + } + common-labels = common_labels +}