chore: split eksd and rke2 bundles (#201)

chore: upgrade zarf to match uds-cli version docs: update docs
defenseunicorns · Sep 27, 2024 · b865581 · b865581
1 parent 8fedecc
commit b865581
Show file tree

Hide file tree

Showing 11 changed files with 893 additions and 45 deletions.
diff --git a/.github/workflows/publish-bundle.yaml b/.github/workflows/publish-bundle.yaml
@@ -55,9 +55,13 @@ jobs:
       ####
       # Build and publish bundle
       ####
-      - name: Build bundle
-        run: uds run create-bundle
+      - name: Build bundles
+        run: |
+          uds run create-eksd-bundle
+          uds run create-rke2-bundle
 
       - name: Publish bundle
-        run: uds publish uds-bundle-software-factory-nutanix-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-bundle --no-progress
+        run: |
+          uds publish uds-bundle-software-factory-nutanix-eksd-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-bundle --no-progress
+          uds publish uds-bundle-software-factory-nutanix-rke2-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-bundle --no-progress
         working-directory: build
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,53 @@
+{
+  "debug.javascript.terminalOptions": {
+    "enableTurboSourcemaps": true,
+    "resolveSourceMapLocations": [
+      "${workspaceFolder}/**",
+      "node_modules/kubernetes-fluent-client/**",
+      "node_modules/pepr/**"
+    ]
+  },
+  "yaml.schemas": {
+    // renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
+    "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.16.0/uds.schema.json": [
+      "uds-bundle.yaml"
+    ],
+
+    // renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
+    "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.16.0/tasks.schema.json": [
+      "tasks.yaml",
+      "tasks/**/*.yaml",
+      "src/**/validate.yaml"
+    ],
+    // renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
+    "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.16.0/zarf.schema.json": [
+      "zarf.yaml"
+    ]
+  },
+  "cSpell.words": [
+    "alertmanager",
+    "Authservice",
+    "automount",
+    "controlplane",
+    "crds",
+    "distros",
+    "ironbank",
+    "Kiali",
+    "Kyverno",
+    "MITM",
+    "neuvector",
+    "opensource",
+    "promtail",
+    "Quarkus",
+    "Quickstart",
+    "seccomp",
+    "Sysctls",
+    "Velero"
+  ],
+  "cSpell.enabled": true,
+  "[typescript]": {
+    "editor.codeActionsOnSave": {
+        "source.organizeImports": "always"
+    }
+  },
+}
diff --git a/README.md b/README.md
@@ -123,23 +123,18 @@ For demonstration purposes, you can setup a local configfile as follows:
 ### Deployment
 Select a target version number and gather the OCI image reference [from the packages page](https://github.com/orgs/defenseunicorns/packages?repo_name=uds-bundle-software-factory-nutanix). With the above prerequisites and configuration complete, you can deploy the bundle directly via OCI:
 ```
-uds deploy oci://ghcr.io/defenseunicorns/uds-bundle/software-factory-nutanix:0.x.x --architecure amd64 --confirm
+uds deploy oci://ghcr.io/defenseunicorns/uds-bundle/software-factory-nutanix-eksd:0.x.x --architecure amd64 --confirm
 ```
 
 ### (OPTIONAL) Local Deployment Reference
 Situationally, it may be useful to download the deployment artifact so that it may be referenced offline. This can be accomplished by first downloading the target release:
 ```
-uds pull oci://ghcr.io/defenseunicorns/uds-bundle/software-factory-nutanix:0.x.x --architecture amd64
+uds pull oci://ghcr.io/defenseunicorns/uds-bundle/software-factory-nutanix-eksd:0.x.x --architecture amd64
 ```
 
 And subsequently deploying from the local file:
 ```
-uds deploy uds-bundle-software-factory-nutanix-amd64-0.x.x.tar.zst --confirm
-```
-
->NOTE: There is a new default terminal user interface for UDS. When running a deploy from a pipeline you can choose to have the normal terminal output by using the `--no-tea` flag with your uds deploy.
-```
-uds deploy uds-bundle-software-factory-nutanix-amd64-0.x.x.tar.zst --confirm --no-tea
+uds deploy uds-bundle-software-factory-nutanix-eksd-amd64-0.x.x.tar.zst --confirm
 ```
 ## Custom Keycloak Plugin
 The Keycloak installation provided as part of UDS Core loads themes and plugins from an init-container. You can optionally provide custom JARs at deploytime simply by adding them to the directory where you run `uds deploy`. This will result in a custom Zarf package being built locally (to include your custom JAR).
@@ -152,9 +147,6 @@ You can reference the uds tasks in this project to learn how to build and deploy
 ```bash
 # List the available tasks to run
 uds run --list
-
-# Run the create-bundle task
-uds run create-bundle
 ```
 
 To force terminate a namespace that is hanging, try this. This state is often brought about during development by deleting the metrics

diff --git a/bundles/uds-core-swf/uds-bundle.yaml → bundles/eksd/uds-bundle.yaml b/bundles/uds-core-swf/uds-bundle.yaml → bundles/eksd/uds-bundle.yaml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.13.1/uds.schema.json
 kind: UDSBundle
 metadata:
-  name: software-factory-nutanix
+  name: software-factory-nutanix-eksd
   description: A UDS bundle for deploying a software factory to an RKE2 cluster
   # x-release-please-start-version
   version: "0.3.2"
@@ -33,7 +33,7 @@ packages:
   # Zarf init
   - name: init
     repository: ghcr.io/zarf-dev/packages/init
-    ref: v0.38.2
+    ref: v0.39.0
     overrides:
       zarf-seed-registry:
         docker-registry:
@@ -53,7 +53,9 @@ packages:
 
   - name: nutanix-csi
     path: ../../build
-    ref: 0.0.1
+    ref: 3.0.0
+    optionalComponents:
+      - nutanix-csi-snapshot
     overrides:
       nutanix-csi-storage:
         nutanix-csi-storage: