From 4dd1cc61e20b9822eb080b7e8db7257d83a2a1fd Mon Sep 17 00:00:00 2001
From: Diego Monti <diego.monti@spaziodati.eu>
Date: Tue, 1 Oct 2024 14:25:48 +0200
Subject: [PATCH 1/2] feat: Add amazon-vpc-resource-controller

---
 .github/workflows/main.yml                    | 41 +++++++++++++++++++
 .../config.jsonnet                            | 25 +++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 libs/amazon-vpc-resource-controller/config.jsonnet

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a525459e..0e23718b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -80,6 +80,46 @@
         "SSH_KEY": "${{ secrets.DEPLOY_KEY }}"
       "if": "steps.filter.outputs.workflows == 'true'"
       "run": "make libs/aiven"
+  "amazon-vpc-resource-controller":
+    "name": "Generate amazon-vpc-resource-controller Jsonnet library and docs"
+    "needs":
+    - "build"
+    - "repos"
+    "runs-on": "ubuntu-latest"
+    "steps":
+    - "uses": "actions/checkout@v3"
+    - "id": "filter"
+      "uses": "dorny/paths-filter@v2"
+      "with":
+        "filters": |
+          workflows:
+            - '.github/**'
+            - 'bin/**'
+            - 'Dockerfile'
+            - 'go.mod'
+            - 'go.sum'
+            - 'jsonnet/**'
+            - 'main.go'
+            - 'Makefile'
+            - 'pkg/**'
+            - 'scripts/**'
+            - 'tf/**'
+            - 'libs/amazon-vpc-resource-controller/**'
+    - "if": "steps.filter.outputs.workflows == 'true'"
+      "uses": "actions/download-artifact@v2"
+      "with":
+        "name": "docker-artifact"
+        "path": "artifacts"
+    - "if": "steps.filter.outputs.workflows == 'true'"
+      "run": "make load"
+    - "env":
+        "DIFF": "true"
+        "GEN_COMMIT": "${{ github.ref == 'refs/heads/master' && github.repository == 'jsonnet-libs/k8s' }}"
+        "GIT_COMMITTER_EMAIL": "86770550+jsonnet-libs-bot@users.noreply.github.com"
+        "GIT_COMMITTER_NAME": "jsonnet-libs-bot"
+        "SSH_KEY": "${{ secrets.DEPLOY_KEY }}"
+      "if": "steps.filter.outputs.workflows == 'true'"
+      "run": "make libs/amazon-vpc-resource-controller"
   "argo-cd":
     "name": "Generate argo-cd Jsonnet library and docs"
     "needs":
@@ -2260,6 +2300,7 @@
     "needs":
     - "actions-runner-controller"
     - "aiven"
+    - "amazon-vpc-resource-controller"
     - "argo-cd"
     - "argo-rollouts"
     - "argo-workflows"
diff --git a/libs/amazon-vpc-resource-controller/config.jsonnet b/libs/amazon-vpc-resource-controller/config.jsonnet
new file mode 100644
index 00000000..aa333cd3
--- /dev/null
+++ b/libs/amazon-vpc-resource-controller/config.jsonnet
@@ -0,0 +1,25 @@
+local config = import 'jsonnet/config.jsonnet';
+
+local versions = [
+  { version: '1.2', tag: 'v1.2.2' },
+  { version: '1.3', tag: 'v1.3.4' },
+  { version: '1.4', tag: 'v1.4.7' },
+  { version: '1.5', tag: 'v1.5.0' },
+  { version: '1.6', tag: 'v1.6.0' },
+];
+
+config.new(
+  name='amazon-vpc-resource-controller',
+  specs=[
+    {
+      output: v.version,
+      prefix: '^aws\\.k8s\\.vpcresources\\..*',
+      crds: [
+        'https://raw.githubusercontent.com/aws/amazon-vpc-resource-controller-k8s/%s/config/crd/bases/vpcresources.k8s.aws_cninodes.yaml' % v.tag,
+        'https://raw.githubusercontent.com/aws/amazon-vpc-resource-controller-k8s/%s/config/crd/bases/vpcresources.k8s.aws_securitygrouppolicies.yaml' % v.tag,
+      ],
+      localName: 'amazon_vpc_resource_controller',
+    }
+    for v in versions
+  ]
+)

From 0b7e36ce2d57ab869efdad5356f965cdb703eb91 Mon Sep 17 00:00:00 2001
From: Duologic <jeroen@simplistic.be>
Date: Fri, 11 Oct 2024 12:33:05 +0200
Subject: [PATCH 2/2] fix(gha): use latest actions

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0e23718b..1a051fe0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -87,9 +87,9 @@
     - "repos"
     "runs-on": "ubuntu-latest"
     "steps":
-    - "uses": "actions/checkout@v3"
+    - "uses": "actions/checkout@v4"
     - "id": "filter"
-      "uses": "dorny/paths-filter@v2"
+      "uses": "dorny/paths-filter@v3"
       "with":
         "filters": |
           workflows:
@@ -106,7 +106,7 @@
             - 'tf/**'
             - 'libs/amazon-vpc-resource-controller/**'
     - "if": "steps.filter.outputs.workflows == 'true'"
-      "uses": "actions/download-artifact@v2"
+      "uses": "actions/download-artifact@v4"
       "with":
         "name": "docker-artifact"
         "path": "artifacts"