WIP

Signed-off-by: Dimitris Karakasilis <[email protected]>
kairos-io · Oct 10, 2023 · 0874884 · 0874884
1 parent d8b3a0a
commit 0874884
Show file tree

Hide file tree

Showing 6 changed files with 187 additions and 66 deletions.
diff --git a/.github/flavors-arm.json b/.github/flavors-arm.json
diff --git a/.github/flavors.json b/.github/flavors.json
@@ -1,50 +1,147 @@
 [
     {
         "flavor": "opensuse-leap",
-        "standard": "true"
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "opensuse/leap:15.5"
+    },
+    {
+        "flavor": "opensuse-leap",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "opensuse/leap:15.5"
     },
     {
         "flavor": "opensuse-tumbleweed",
-        "standard": "true"
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "opensuse/tumbleweed"
     },
     {
-        "flavor": "ubuntu",
-        "standard": "true"
+        "flavor": "opensuse-tumbleweed",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "opensuse/tumbleweed"
     },
     {
-        "flavor": "ubuntu-20-lts",
-        "standard": "true"
+        "flavor": "ubuntu-20.04",
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "ubuntu:20.04"
     },
     {
-        "flavor": "fips-systemd",
-        "frameworkonly": "true"
+        "flavor": "ubuntu-20.04",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "ubuntu:20.04"
     },
     {
-        "flavor": "ubuntu-22-lts",
-        "standard": "true"
+        "flavor": "ubuntu-22.04",
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "ubuntu:22.04"
+    },
+    {
+        "flavor": "ubuntu-22.04",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "ubuntu:22.04"
+    },
+    {
+        "flavor": "ubuntu-23.04",
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "ubuntu:23.04"
+    },
+    {
+        "flavor": "ubuntu-23.04",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "ubuntu:23.04"
     },
     {
         "flavor": "alpine-ubuntu",
-        "standard": "true"
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "alpine:3.18"
+    },
+    {
+        "flavor": "alpine-ubuntu",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "alpine:3.18"
     },
     {
         "flavor": "alpine-opensuse-leap",
-        "standard": "true"
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "alpine:3.18"
     },
     {
-        "flavor": "fedora",
-        "standard": "true"
+        "flavor": "alpine-opensuse-leap",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "alpine:3.18"
     },
     {
-        "flavor": "debian",
-        "standard": "true"
+        "flavor": "fedora-38",
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "fedora:38"
     },
     {
-        "flavor": "rockylinux",
-        "standard": "true"
+        "flavor": "fedora-38",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "fedora:38"
+    },
+    {
+        "flavor": "debian-testing",
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "debian:testing"
+    },
+    {
+        "flavor": "debian-testing",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "debian:testing"
     },
     {
-        "flavor": "almalinux"
+        "flavor": "debian-bookworm",
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "debian:bookworm-slim"
+    },
+    {
+        "flavor": "debian-bookworm",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "debian:bookworm-slim"
+    },
+    {
+        "flavor": "rockylinux-9",
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "rockylinux:9"
+    },
+    {
+        "flavor": "rockylinux-9",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "rockylinux:9"
+    },
+    {
+        "flavor": "almalinux-9",
+        "variant": "standard",
+        "model": "generic",
+        "baseImage": "almalinux:9"
+    },
+    {
+        "flavor": "almalinux-9",
+        "variant": "core",
+        "model": "generic",
+        "baseImage": "almalinux:9"
     },
     {
         "flavor": "opensuse-leap",
@@ -86,5 +183,10 @@
         "flavor": "ubuntu-20-lts",
         "model": "jetson-agx-orin",
         "worker": "fast"
+    },
+    {
+        "TODO": "Remove this, there is only going to be one framwork image",
+        "flavor": "fips-systemd",
+        "frameworkonly": "true"
     }
 ]
diff --git a/.github/workflows/image-arm.yaml b/.github/workflows/image-arm.yaml
@@ -49,7 +49,7 @@ jobs:
           # Construct an array like this from the found versions:
           sudo luet --config framework-profile.yaml search -o json k8s/k3s  | jq '.packages | map(.version) | unique' >  k3s_versions.json
           # Create a combination of flavors and k3s versions.
-          content=$(jq -s '. | [combinations | .[0] + {"k3s_version": .[1]}] | map(select(.frameworkonly != "true")) | map(select(.standard == "true"))' .github/flavors-arm.json k3s_versions.json)
+          content=$(jq -s '. | [combinations | .[0] + {"k3s_version": .[1]}] | map(select(.frameworkonly != "true")) | map(select(.variant == "standard"))' .github/flavors-arm.json k3s_versions.json)
           # the following lines are only required for multi line json
           content="${content//'%'/'%25'}"
           content="${content//$'\n'/'%0A'}"

diff --git a/.github/workflows/release-arm.yaml b/.github/workflows/release-arm.yaml
@@ -41,7 +41,7 @@ jobs:
           # Construct an array like this from the found versions:
           sudo luet --config framework-profile.yaml search -o json k8s/k3s  | jq '.packages | map(.version) | unique' >  k3s_versions.json
           # Create a combination of flavors and k3s versions.
-          content=$(jq -s '. | [combinations | .[0] + {"k3s_version": .[1]}] | map(select(.frameworkonly != "true")) | map(select(.standard == "true"))' .github/flavors-arm.json k3s_versions.json)
+          content=$(jq -s '. | [combinations | .[0] + {"k3s_version": .[1]}] | map(select(.frameworkonly != "true")) | map(select(.variant == "standard"))' .github/flavors-arm.json k3s_versions.json)
           # the following lines are only required for multi line json
           content="${content//'%'/'%25'}"
           content="${content//$'\n'/'%0A'}"

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -45,7 +45,7 @@ jobs:
           sudo mv luet /usr/bin/luet
           # Construct an array like this from the found versions:
           sudo luet --config framework-profile.yaml search -o json k8s/k3s  | jq '.packages | map(.version) | unique' >  k3s_versions.json
-          content=$(jq -s '. | [combinations | .[0] + {"k3s_version": .[1]}] | map(select(.frameworkonly != "true")) | map(select(.standard == "true"))' .github/flavors.json k3s_versions.json)
+          content=$(jq -s '. | [combinations | .[0] + {"k3s_version": .[1]}] | map(select(.frameworkonly != "true")) | map(select(.variant == "standard"))' .github/flavors.json k3s_versions.json)
           # the following lines are only required for multi line json
           content="${content//'%'/'%25'}"
           content="${content//$'\n'/'%0A'}"

diff --git a/Earthfile b/Earthfile
@@ -37,6 +37,13 @@ ARG K3S_VERSION
 
 all:
   ARG SECURITY_SCANS=true
+
+  # args for base-image target
+  ARG --required FLAVOR
+  ARG --required BASE_IMAGE
+  ARG --required MODEL
+  ARG --required VARIANT
+
   BUILD +base-image
   IF [ "$SECURITY_SCANS" = "true" ]
       BUILD +image-sbom
@@ -50,6 +57,13 @@ all:
 # For PR building, only image and iso are needed
 ci:
   ARG SECURITY_SCANS=true
+
+  # args for base-image target
+  ARG --required FLAVOR
+  ARG --required BASE_IMAGE
+  ARG --required MODEL
+  ARG --required VARIANT
+
   BUILD +base-image
   IF [ "$SECURITY_SCANS" = "true" ]
     BUILD +image-sbom
@@ -61,6 +75,13 @@ ci:
 all-arm:
   ARG SECURITY_SCANS=true
   ARG MODEL=rpi4
+
+  # args for base-image target
+  ARG --required FLAVOR
+  ARG --required BASE_IMAGE
+  ARG --required MODEL
+  ARG --required VARIANT
+
   BUILD --platform=linux/arm64 +base-image --MODEL=$MODEL
   IF [ "$SECURITY_SCANS" = "true" ]
       BUILD --platform=linux/arm64 +image-sbom --MODEL=$MODEL
@@ -76,10 +97,25 @@ all-arm:
 
 arm-container-image:
   ARG MODEL
+
+  # args for base-image target
+  ARG --required FLAVOR
+  ARG --required BASE_IMAGE
+  ARG --required MODEL
+  ARG --required VARIANT
+
   BUILD --platform=linux/arm64 +base-image --MODEL=$MODEL
 
 all-arm-generic:
-  BUILD --platform=linux/arm64 +base-image --MODEL=generic
+
+  # args for base-image target
+  ARG --required FLAVOR
+  ARG --required BASE_IMAGE
+  ARG --required MODEL
+  ARG --required VARIANT
+
+  # TODO: Remove this line? +iso calls it eventually
+  #BUILD --platform=linux/arm64 +base-image --MODEL=generic
   BUILD --platform=linux/arm64 +iso --MODEL=generic
 
 build-and-push-golang-testing:
@@ -861,6 +897,13 @@ trivy:
 
 trivy-scan:
     ARG TARGETARCH
+
+    # args for base-image target
+    ARG --required FLAVOR
+    ARG --required BASE_IMAGE
+    ARG --required MODEL
+    ARG --required VARIANT
+
     # Use base-image so it can read original os-release file
     FROM +base-image
     COPY +trivy/trivy /trivy
@@ -889,6 +932,13 @@ grype:
 
 grype-scan:
     ARG TARGETARCH
+
+    # args for base-image target
+    ARG --required FLAVOR
+    ARG --required BASE_IMAGE
+    ARG --required MODEL
+    ARG --required VARIANT
+
     # Use base-image so it can read original os-release file
     FROM +base-image
     COPY +grype/grype /grype
@@ -1146,6 +1196,12 @@ temp-image:
 
     ARG TTL_IMAGE = "ttl.sh/${NAME}:${EXPIRATION}"
 
+    # args for base-image target
+    ARG --required FLAVOR
+    ARG --required BASE_IMAGE
+    ARG --required MODEL
+    ARG --required VARIANT
+
     FROM +base-image
     SAVE IMAGE --push $TTL_IMAGE
 
@@ -1185,6 +1241,12 @@ bump-repositories:
     SAVE ARTIFACT framework-profile.yaml AS LOCAL framework-profile.yaml
 
 luet-versions:
+    # args for base-image target
+    ARG --required FLAVOR
+    ARG --required BASE_IMAGE
+    ARG --required MODEL
+    ARG --required VARIANT
+
     FROM +base-image
     SAVE ARTIFACT /framework/etc/kairos/versions.yaml versions.yaml AS LOCAL build/versions.yaml