Merge branch 'main' into zarf-adoption-walkthrough

zarf-dev · May 15, 2023 · a79a658 · a79a658
2 parents e1d241f + dd16181
commit a79a658
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/docs-website/static/docs/tutorials/package_create_init.html b/docs-website/static/docs/tutorials/package_create_init.html
@@ -206,7 +206,7 @@
 <b style="color:#ff55ff;">    </b><b style="color:#55ffff;">files</b>:
     -<b style="color:#ff55ff;"> packages/gitea/connect.yaml</b>
 <b style="color:#ff55ff;">  </b><b style="color:#55ffff;">images</b>:
-  -<b style="color:#ff55ff;"> gitea/gitea:1.18.5</b>
+  -<b style="color:#ff55ff;"> gitea/gitea:1.18.5-rootless</b>
 <b style="color:#ff55ff;"></b><b style="color:#55ffff;">variables</b>:
 -<b style="color:#55ffff;"> name</b>:<b style="color:#ff55ff;"> K3S_ARGS</b>
 <b style="color:#ff55ff;">  </b><b style="color:#55ffff;">description</b>:<b style="color:#ff55ff;"> Arguments to pass to K3s</b>

diff --git a/docs-website/static/docs/tutorials/zarf_init.html b/docs-website/static/docs/tutorials/zarf_init.html
@@ -185,7 +185,7 @@
 <b style="color:#ff55ff;">    </b><b style="color:#55ffff;">files</b>:
     -<b style="color:#ff55ff;"> packages/gitea/connect.yaml</b>
 <b style="color:#ff55ff;">  </b><b style="color:#55ffff;">images</b>:
-  -<b style="color:#ff55ff;"> gitea/gitea:1.18.5</b>
+  -<b style="color:#ff55ff;"> gitea/gitea:1.18.5-rootless</b>
 <b style="color:#ff55ff;"></b><b style="color:#55ffff;">variables</b>:
 -<b style="color:#55ffff;"> name</b>:<b style="color:#ff55ff;"> K3S_ARGS</b>
 <b style="color:#ff55ff;">  </b><b style="color:#55ffff;">description</b>:<b style="color:#ff55ff;"> Arguments to pass to K3s</b>
@@ -344,7 +344,7 @@
 <b style="color:#55ffff;">  files</b>:
 <b style="color:#55ffff;">  -</b><b style="color:#ff55ff;">  packages/gitea/connect.yaml</b>
 <b style="color:#55ffff;">images</b>:
--<b style="color:#ff55ff;"> gitea/gitea:1.18.5</b>
+-<b style="color:#ff55ff;"> gitea/gitea:1.18.5-rootless</b>
 
 <b class=MAG>Deploys Gitea to provide git repositories for Kubernetes configurations. Required for GitOps</b>
 <b class=MAG>deployments if no other git server is available.</b>

diff --git a/packages/gitea/gitea-values.yaml b/packages/gitea/gitea-values.yaml
@@ -38,3 +38,6 @@ memcached:
 
 postgresql:
   enabled: false
+
+image:
+  rootless: true
diff --git a/packages/gitea/zarf.yaml b/packages/gitea/zarf.yaml
@@ -33,7 +33,7 @@ components:
       Deploys Gitea to provide git repositories for Kubernetes configurations.
       Required for GitOps deployments if no other git server is available.
     images:
-      - gitea/gitea:1.18.5
+      - gitea/gitea:1.18.5-rootless
     manifests:
       - name: git-connect
         namespace: zarf

diff --git a/src/test/e2e/06_create_sbom_test.go b/src/test/e2e/06_create_sbom_test.go
@@ -58,9 +58,9 @@ func TestCreateSBOM(t *testing.T) {
 	_, err = os.ReadFile(filepath.Join(sbomPath, "dos-games", "sbom-viewer-defenseunicorns_zarf-game_multi-tile-dark.html"))
 	require.NoError(t, err)
 	// Test that the init package generates the SBOMs we expect (images + component files)
-	_, err = os.ReadFile(filepath.Join(sbomPath, "init", "sbom-viewer-gitea_gitea_1.18.5.html"))
+	_, err = os.ReadFile(filepath.Join(sbomPath, "init", "sbom-viewer-gitea_gitea_1.18.5-rootless.html"))
 	require.NoError(t, err)
-	_, err = os.ReadFile(filepath.Join(sbomPath, "init", "gitea_gitea_1.18.5.json"))
+	_, err = os.ReadFile(filepath.Join(sbomPath, "init", "gitea_gitea_1.18.5-rootless.json"))
 	require.NoError(t, err)
 	_, err = os.ReadFile(filepath.Join(sbomPath, "init", "sbom-viewer-zarf-component-k3s.html"))
 	require.NoError(t, err)