Skip to content

Commit

Permalink
add calico-apiserver
Browse files Browse the repository at this point in the history
Signed-off-by: Josh Wolf <josh@wolfs.io>
  • Loading branch information
joshrwolf committed May 20, 2024
1 parent da39268 commit 3f188a2
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 16 deletions.
24 changes: 24 additions & 0 deletions images/calico/configs/latest.apiserver.apko.yaml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion images/calico/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ locals {
"csi",
"typha",
"pod2daemon",
"node-driver-registrar"
"node-driver-registrar",
"apiserver"
])

// Normally the package is named like "calico-{component}"
Expand Down
2 changes: 2 additions & 0 deletions images/calico/tests/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions images/calico/tests/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ variable "digests" {
typha = string
node-driver-registrar = string
calicoctl = string
apiserver = string
})
}

Expand Down Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions images/datadog-agent/tests/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,21 @@ resource "imagetest_feature" "basic" {
harness = imagetest_harness_k3s.this

steps = [
{
name = "Setup fakeintake"
cmd = "kubectl apply --wait -f /tests/fakeintake.yaml"
},
{
name = "Helm install"
cmd = module.helm.install_cmd
},
{
# The chart doesn't check this for us because of the DS healthchecks, but
# they do emit proper readiness signals
name = "Check datadog-agent pods"
cmd = "kubectl wait --for=condition=Ready pods --all --namespace ${var.namespace}"
retry = { attempts = 5, delay = "10s" }
},
# {
# name = "Setup fakeintake"
# cmd = "kubectl apply --wait -f /tests/fakeintake.yaml"
# },
# {
# name = "Helm install"
# cmd = module.helm.install_cmd
# },
# {
# # The chart doesn't check this for us because of the DS healthchecks, but
# # they do emit proper readiness signals
# name = "Check datadog-agent pods"
# cmd = "kubectl wait --for=condition=Ready pods --all --namespace ${var.namespace}"
# retry = { attempts = 5, delay = "10s" }
# },
]

labels = {
Expand Down

0 comments on commit 3f188a2

Please sign in to comment.