From 220447ed64f7bb68ea2b4abfe9851b76746d8dc2 Mon Sep 17 00:00:00 2001 From: willie-yao Date: Fri, 10 Jan 2025 19:40:07 +0000 Subject: [PATCH] Add monitoring tag to e2e test template --- .../cluster-template-prow-ci-version-dual-stack.yaml | 2 ++ .../ci/cluster-template-prow-ci-version-ipv6.yaml | 2 ++ .../test/ci/cluster-template-prow-ci-version.yaml | 2 ++ templates/test/ci/cluster-template-prow.yaml | 2 ++ .../ci/patches/azuremachinetemplate-monitoring.yaml | 11 +++++++++++ templates/test/ci/prow/kustomization.yaml | 1 + .../test/dev/cluster-template-custom-builds-load.yaml | 2 ++ .../test/dev/cluster-template-custom-builds.yaml | 2 ++ 8 files changed, 24 insertions(+) create mode 100644 templates/test/ci/patches/azuremachinetemplate-monitoring.yaml diff --git a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml index 0a3d54c620f..3b3721a0764 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml @@ -305,6 +305,8 @@ metadata: spec: template: spec: + additionalTags: + monitoring: virtualmachine enableIPForwarding: true identity: UserAssigned image: diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml index cbf94be6a1b..d2b6e221fe2 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml @@ -312,6 +312,8 @@ metadata: spec: template: spec: + additionalTags: + monitoring: virtualmachine enableIPForwarding: true identity: UserAssigned image: diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index 8b64532ba96..7a3de2f490a 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -283,6 +283,8 @@ metadata: spec: template: spec: + additionalTags: + monitoring: virtualmachine identity: UserAssigned image: marketplace: diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml index d65a2895f7c..e781db017f6 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -176,6 +176,8 @@ metadata: spec: template: spec: + additionalTags: + monitoring: virtualmachine identity: UserAssigned osDisk: diskSizeGB: 128 diff --git a/templates/test/ci/patches/azuremachinetemplate-monitoring.yaml b/templates/test/ci/patches/azuremachinetemplate-monitoring.yaml new file mode 100644 index 00000000000..127709de575 --- /dev/null +++ b/templates/test/ci/patches/azuremachinetemplate-monitoring.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 +kind: AzureMachineTemplate +metadata: + name: ${CLUSTER_NAME}-md-0 + namespace: default +spec: + template: + spec: + additionalTags: + monitoring: virtualmachine \ No newline at end of file diff --git a/templates/test/ci/prow/kustomization.yaml b/templates/test/ci/prow/kustomization.yaml index 37621a2333b..8dbf5019f38 100644 --- a/templates/test/ci/prow/kustomization.yaml +++ b/templates/test/ci/prow/kustomization.yaml @@ -42,6 +42,7 @@ patches: - path: ../patches/windows-machine-deployment-replicas.yaml - path: ../../../azure-cluster-identity/azurecluster-identity-ref.yaml - path: ../patches/azuremachinetemplate-vmextension.yaml +- path: ../patches/azuremachinetemplate-monitoring.yaml - path: ../patches/windows-feature-gates.yaml - path: ../patches/windows-containerd-labels.yaml - path: ../patches/windows-server-version.yaml diff --git a/templates/test/dev/cluster-template-custom-builds-load.yaml b/templates/test/dev/cluster-template-custom-builds-load.yaml index da053139731..d37d16069a2 100644 --- a/templates/test/dev/cluster-template-custom-builds-load.yaml +++ b/templates/test/dev/cluster-template-custom-builds-load.yaml @@ -281,6 +281,8 @@ metadata: spec: template: spec: + additionalTags: + monitoring: virtualmachine identity: UserAssigned image: marketplace: diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index 7c07739985e..d23fb6a1a50 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -275,6 +275,8 @@ metadata: spec: template: spec: + additionalTags: + monitoring: virtualmachine identity: UserAssigned image: marketplace: