From 088f34ddb968532a84afeaa4f992ec2180df39b8 Mon Sep 17 00:00:00 2001
From: Josh Wolf <josh@wolfs.io>
Date: Mon, 20 May 2024 12:10:08 -0400
Subject: [PATCH] add calico-apiserver (#2707)

Signed-off-by: Josh Wolf <josh@wolfs.io>
---
 .../calico/configs/latest.apiserver.apko.yaml | 24 +++++++++++++++++++
 images/calico/main.tf                         |  3 ++-
 images/calico/tests/install.sh                |  2 ++
 images/calico/tests/main.tf                   |  3 +++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 images/calico/configs/latest.apiserver.apko.yaml

diff --git a/images/calico/configs/latest.apiserver.apko.yaml b/images/calico/configs/latest.apiserver.apko.yaml
new file mode 100644
index 0000000000..ec38599889
--- /dev/null
+++ b/images/calico/configs/latest.apiserver.apko.yaml
@@ -0,0 +1,24 @@
+contents:
+  packages:
+    - calico-apiserver
+
+accounts:
+  groups:
+    - groupname: nonroot
+      gid: 65532
+  users:
+    - username: nonroot
+      uid: 65532
+      gid: 65532
+  # Chart overrides this at runtime
+  # https://github.com/projectcalico/calico/blob/23ae58b62765b14aa2c5952b2fc6c40155731a79/manifests/apiserver.yaml#L91
+  run-as: 65532
+
+paths:
+  # https://github.com/projectcalico/calico/blob/23ae58b62765b14aa2c5952b2fc6c40155731a79/manifests/apiserver.yaml#L93
+  - path: /code
+    type: directory
+    permissions: 0o777
+
+entrypoint:
+  command: /usr/bin/calico-apiserver
diff --git a/images/calico/main.tf b/images/calico/main.tf
index 0d219b5288..7f1a464c00 100644
--- a/images/calico/main.tf
+++ b/images/calico/main.tf
@@ -7,7 +7,8 @@ locals {
     "csi",
     "typha",
     "pod2daemon",
-    "node-driver-registrar"
+    "node-driver-registrar",
+    "apiserver"
   ])
 
   // Normally the package is named like "calico-{component}"
diff --git a/images/calico/tests/install.sh b/images/calico/tests/install.sh
index 9f4d6b38b0..0762d35de8 100755
--- a/images/calico/tests/install.sh
+++ b/images/calico/tests/install.sh
@@ -48,6 +48,8 @@ spec:
       digest: ${CSI_DIGEST}
     - image: calico/typha
       digest: ${TYPHA_DIGEST}
+    - image: calico/apiserver
+      digest: ${APISERVER_DIGEST}
     - image: calico/node-driver-registrar
       digest: ${NODE_DRIVER_REGISTRAR_DIGEST}
     # This isn't used on Linux, it just needs to have a value.
diff --git a/images/calico/tests/main.tf b/images/calico/tests/main.tf
index fa9dee0273..a5389cd25c 100644
--- a/images/calico/tests/main.tf
+++ b/images/calico/tests/main.tf
@@ -16,6 +16,7 @@ variable "digests" {
     typha                 = string
     node-driver-registrar = string
     calicoctl             = string
+    apiserver             = string
   })
 }
 
@@ -72,6 +73,8 @@ spec:
       digest: ${local.parsed["csi"].digest}
     - image: calico/typha
       digest: ${local.parsed["typha"].digest}
+    - image: calico/apiserver
+      digest: ${local.parsed["apiserver"].digest}
     - image: calico/node-driver-registrar
       digest: ${local.parsed["node-driver-registrar"].digest}
 EOm