From dd1618199047eb7dcf3a1f8dfba1c6618f1b32e0 Mon Sep 17 00:00:00 2001 From: Jordan McClintock Date: Mon, 15 May 2023 14:57:34 -0400 Subject: [PATCH] Change gitea to rootless version to enable compatibility with EFS (#1706) ## Description As the title says Fixes: #904 ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds functionality) - [ ] Other (security config, docs update, etc) ## Checklist before merging - [X] Test, docs, adr added or updated as needed - [X] [Contributor Guide Steps](https://github.com/defenseunicorns/zarf/blob/main/CONTRIBUTING.md#developer-workflow) followed --- docs-website/static/docs/tutorials/package_create_init.html | 2 +- docs-website/static/docs/tutorials/zarf_init.html | 4 ++-- packages/gitea/gitea-values.yaml | 3 +++ packages/gitea/zarf.yaml | 2 +- src/test/e2e/06_create_sbom_test.go | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docs-website/static/docs/tutorials/package_create_init.html b/docs-website/static/docs/tutorials/package_create_init.html index 7bf6795971..024af640d3 100644 --- a/docs-website/static/docs/tutorials/package_create_init.html +++ b/docs-website/static/docs/tutorials/package_create_init.html @@ -206,7 +206,7 @@ files: - packages/gitea/connect.yaml images: - - gitea/gitea:1.18.5 + - gitea/gitea:1.18.5-rootless variables: - name: K3S_ARGS description: Arguments to pass to K3s diff --git a/docs-website/static/docs/tutorials/zarf_init.html b/docs-website/static/docs/tutorials/zarf_init.html index b2d65f9149..f9fa56c797 100644 --- a/docs-website/static/docs/tutorials/zarf_init.html +++ b/docs-website/static/docs/tutorials/zarf_init.html @@ -185,7 +185,7 @@ files: - packages/gitea/connect.yaml images: - - gitea/gitea:1.18.5 + - gitea/gitea:1.18.5-rootless variables: - name: K3S_ARGS description: Arguments to pass to K3s @@ -344,7 +344,7 @@ files: - packages/gitea/connect.yaml images: -- gitea/gitea:1.18.5 +- gitea/gitea:1.18.5-rootless Deploys Gitea to provide git repositories for Kubernetes configurations. Required for GitOps deployments if no other git server is available. diff --git a/packages/gitea/gitea-values.yaml b/packages/gitea/gitea-values.yaml index 977f792572..5d3814b74a 100644 --- 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 index aa6d1ef31d..cae0d76818 100644 --- 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 index d64d06c396..45cfdbfac4 100644 --- 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)