From 2bd629d61d8f0b42b759dc446951e38f670f1f01 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Thu, 3 Oct 2024 16:05:34 -0400
Subject: [PATCH 1/2] Use new chart-vendor

Depends-On: https://github.com/vexxhost/chart-vendor/pull/8
---
 tox.ini                          |  9 ---------
 zuul.d/jobs.yaml                 |  9 ++++++---
 zuul.d/playbooks/linters/pre.yml | 24 ------------------------
 zuul.d/project.yaml              |  1 +
 4 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 zuul.d/playbooks/linters/pre.yml

diff --git a/tox.ini b/tox.ini
index c11a9e66..3f59d1c9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,18 +18,9 @@ commands =
 commands =
   pytest magnum_cluster_api/tests/functional/
 
-[testenv:sync-charts]
-skipsdist = True
-deps =
-  chart-vendor
-commands =
-  chart-vendor --charts-root magnum_cluster_api/charts
-
 [testenv:linters]
 skipsdist = True
 deps =
-  {[testenv:sync-charts]deps}
   pre-commit
 commands =
   pre-commit run --all-files --show-diff-on-failure
-  chart-vendor --check --charts-root magnum_cluster_api/charts
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ceac5e2e..edb5b0bb 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,9 +1,12 @@
+- job:
+    name: magnum-cluster-api-chart-vendor
+    parent: chart-vendor
+    vars:
+      chart_vendor_charts_root: "magnum_cluster_api/charts"
+
 - job:
     name: magnum-cluster-api-linters
     parent: tox-linters
-    pre-run: zuul.d/playbooks/linters/pre.yml
-    required-projects:
-      - name: vexxhost/chart-vendor
 
 - job:
     name: magnum-cluster-api-unit
diff --git a/zuul.d/playbooks/linters/pre.yml b/zuul.d/playbooks/linters/pre.yml
deleted file mode 100644
index bb407944..00000000
--- a/zuul.d/playbooks/linters/pre.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- hosts: all
-  roles:
-    - role: ensure-helm
-      helm_version: 3.13.3
-  tasks:
-    - name: Install patchutils
-      become: true
-      ansible.builtin.package:
-        name: patchutils
-        state: present
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e538d871..c05ba3ac 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,6 +1,7 @@
 - project:
     check:
       jobs:
+        - magnum-cluster-api-chart-vendor
         - magnum-cluster-api-linters
         - magnum-cluster-api-unit
         - magnum-cluster-api-functional

From 51a85076006d06fad56c966cc1a951b70f9e02ad Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Thu, 3 Oct 2024 16:10:23 -0400
Subject: [PATCH 2/2] Add missing requirements lock

---
 magnum_cluster_api/charts/cilium/requirements.lock             | 3 +++
 magnum_cluster_api/charts/cluster-autoscaler/requirements.lock | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 magnum_cluster_api/charts/cilium/requirements.lock
 create mode 100644 magnum_cluster_api/charts/cluster-autoscaler/requirements.lock

diff --git a/magnum_cluster_api/charts/cilium/requirements.lock b/magnum_cluster_api/charts/cilium/requirements.lock
new file mode 100644
index 00000000..e28bc5d9
--- /dev/null
+++ b/magnum_cluster_api/charts/cilium/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"
diff --git a/magnum_cluster_api/charts/cluster-autoscaler/requirements.lock b/magnum_cluster_api/charts/cluster-autoscaler/requirements.lock
new file mode 100644
index 00000000..e28bc5d9
--- /dev/null
+++ b/magnum_cluster_api/charts/cluster-autoscaler/requirements.lock
@@ -0,0 +1,3 @@
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "0001-01-01T00:00:00Z"