Merge pull request #5363 from willie-yao/add-metrics-tag

Add monitoring tag to e2e test template
kubernetes-sigs · Jan 21, 2025 · c2a2562 · c2a2562
2 parents e83a5da + 220447e
commit c2a2562
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 0 deletions.
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
diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml
diff --git a/templates/test/ci/patches/azuremachinetemplate-monitoring.yaml 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
diff --git 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
diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml