Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change gitea to rootless version to enable compatibility with EFS #1706

Merged
merged 1 commit into from
May 15, 2023
Merged

Change gitea to rootless version to enable compatibility with EFS #1706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs-website/static/docs/tutorials/package_create_init.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions docs-website/static/docs/tutorials/zarf_init.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions packages/gitea/gitea-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ memcached:

postgresql:
enabled: false

image:
rootless: true
2 changes: 1 addition & 1 deletion packages/gitea/zarf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/test/e2e/06_create_sbom_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down