Add/forgejo #609

wejdross · 2025-01-27T12:03:19Z

Adding base Forgejo and Codey services, claim examples for easy testing:

apiVersion: vshn.appcat.vshn.io/v1
kind: VSHNForgejo
metadata:
  name: myforgejo
  namespace: kalafior-testing
spec:
  parameters:
    service:
      adminEmail: "[email protected]"
      fqdn:
      #  - "forgejo23.apps.lab-cloudscale-rma-0.appuio.cloud"
        - "myforgejo2.127.0.0.1.nip.io"
    security:
      deletionProtection: false
  writeConnectionSecretToRef:
    name: mysupersecret
---
apiVersion: codey.io/v1
kind: CodeyInstance
metadata:
  name: mycodey
  namespace: vshn-test
spec:
  parameters:
    service:
      adminEmail: "[email protected]"
    size:
      plan: small
  writeConnectionSecretToRef:
    name: mycodey-secret

tobru

I've seen multiple places where Codey is named "VSHNCodey" or "Codey by VSHN". This is wrong, the service is called just "Codey", no VSHN in it. Also see https://kb.vshn.ch/app-catalog/service/forgejo-codey/architecture.html#_codey for how the claim should look like, especially apiVersion and kind.

class/defaults.yml

wejdross · 2025-02-05T15:01:43Z

@tobru @TheBigLee @zugao I need review here before merging

TheBigLee · 2025-02-05T15:31:51Z

class/defaults.yml

@@ -58,7 +61,7 @@ parameters:
      appcat:
        registry: ghcr.io
        repository: vshn/appcat
-        tag: v4.122.0
+        tag: add/forgejo


Don't forget to change that to the correct version

TheBigLee · 2025-02-05T15:33:50Z

component/functions.jsonnet

@@ -20,6 +20,7 @@ local getFunction(name, package, runtimeConfigName) = {
  },
  spec: {
    package: package,
+    packagePullPolicy: 'IfNotPresent',


This should probably be configurable. Especially for local testing, where we want to set it to "Always"

yeah, I have the same feeling, but I'm not sure if this is the correct place to make such change, maybe a followup?

I would keep this as is for now. The appcat function works the same if I am not wrong.

TheBigLee · 2025-02-05T15:36:26Z

tests/e2e/forgejo/00-install.yaml

+    service:
+      adminEmail: "[email protected]"
+      fqdn:
+        - "somesuperingressname.apps.lab-cloudscale-rma-0.appuio.cloud"


I would choose a more useful fqdn eg: forgejo-e2e.apps.lab-cloudscale-rma-0.appuio.cloud

TheBigLee · 2025-02-05T15:36:46Z

tests/e2e/forgejo/scripts/ingress.sh

+fqdn=$(kubectl -n "$ns" get ingress -oyaml | yq -r '.items.[0].spec.tls.[0].hosts[0]')
+
+echo "$fqdn = somesuperingressname.apps.lab-cloudscale-rma-0.appuio.cloud"
+[[ "$fqdn" == "somesuperingressname.apps.lab-cloudscale-rma-0.appuio.cloud" ]]


same here, see above

zugao

We need to discuss some things

zugao · 2025-02-05T15:37:54Z

class/defaults.yml

+      forgejo:
+        registry: ghcr.io
+        image: vshn/forgejo
+        tag: latest


this will probably restart instances once new version is available, we should pin to the latest symver.

that's copy-paste leftover, I just cleaned it up

zugao · 2025-02-05T15:39:00Z

class/defaults.yml

+          defaultPlan: small
+          sla: 99.25
+          plans:
+            mini:


have these plans been agreed already? @tobru

https://kb.vshn.ch/app-catalog/service/forgejo-codey/architecture.html#_codey_plans

zugao · 2025-02-05T15:46:38Z

class/defaults.yml

@@ -951,7 +1023,47 @@ parameters:
                cpu: "2"
                memory: "8Gi"
                disk: 16Gi
-
+        codey:


I don't like the tfact that we are considering Codey as a service like any other service we already offer. Codey is a specific implementation of Forgejo so we need to discuss whether we want to differentiate it in the component from the normal services. For instance we should consider to put it under forgeo or maybe under abstracService instead of service. Also if we agreed that Codey has nothing to do with VSHN that it might not make sense to leave it under vshn at all (appcat.services.vshn). THis has to be discussed asap before it's too late.

this is a good point and I fully agree, but we have our workflow in component and it expects services to be structured in a specific way, if we want to do any change, it's another story, another ticket and it requires a team-wide decision.

Lets keep it this way for now

zugao

LGTM

wejdross force-pushed the add/forgejo branch from 5e28e5e to dcfd8a2 Compare January 27, 2025 13:38

wejdross added minor enhancement New feature or request labels Jan 27, 2025

wejdross force-pushed the add/forgejo branch from 424bfee to 7df1629 Compare January 27, 2025 16:17

wejdross removed the minor label Jan 27, 2025

wejdross force-pushed the add/forgejo branch from 2104735 to 21f5f61 Compare January 27, 2025 17:56

wejdross self-assigned this Jan 27, 2025

wejdross marked this pull request as ready for review January 27, 2025 17:57

wejdross force-pushed the add/forgejo branch 2 times, most recently from ad6c0fa to 1806357 Compare January 28, 2025 11:06

tobru reviewed Jan 29, 2025

View reviewed changes

class/defaults.yml Outdated Show resolved Hide resolved

class/defaults.yml Outdated Show resolved Hide resolved

class/defaults.yml Outdated Show resolved Hide resolved

class/defaults.yml Outdated Show resolved Hide resolved

wejdross force-pushed the add/forgejo branch from 977fd7d to 54fd8bb Compare January 29, 2025 21:11

TheBigLee force-pushed the master branch from 5d57597 to 2ee6123 Compare January 30, 2025 12:57

wejdross force-pushed the add/forgejo branch from 5f6300d to df39623 Compare January 30, 2025 13:55

wejdross requested review from tobru, a team, Kidswiss, TheBigLee and zugao and removed request for a team January 30, 2025 14:03

wejdross force-pushed the add/forgejo branch 3 times, most recently from f7f3776 to 59e1516 Compare February 5, 2025 14:58

TheBigLee reviewed Feb 5, 2025

View reviewed changes

zugao requested changes Feb 5, 2025

View reviewed changes

wejdross added 3 commits February 6, 2025 09:25

adding Forgejo and CodeyInstances

a313520

cleaning up component

91b2dc1

rebase to latest

6301eaf

wejdross force-pushed the add/forgejo branch from f32bafb to 6301eaf Compare February 6, 2025 08:29

wejdross requested review from TheBigLee and zugao February 6, 2025 08:34

zugao approved these changes Feb 6, 2025

View reviewed changes

TheBigLee approved these changes Feb 6, 2025

View reviewed changes

wejdross added 2 commits February 6, 2025 13:32

bumping appcat version

fd0fb86

fixing yaml linter

4347921

wejdross merged commit e7ea7ed into master Feb 6, 2025
10 checks passed

wejdross deleted the add/forgejo branch February 6, 2025 12:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add/forgejo #609

Add/forgejo #609

wejdross commented Jan 27, 2025 •

edited

Loading

tobru left a comment

wejdross commented Feb 5, 2025

TheBigLee Feb 5, 2025

TheBigLee Feb 5, 2025

wejdross Feb 6, 2025

zugao Feb 6, 2025

TheBigLee Feb 5, 2025

wejdross Feb 6, 2025

TheBigLee Feb 5, 2025

wejdross Feb 6, 2025

zugao left a comment

zugao Feb 5, 2025

wejdross Feb 6, 2025

zugao Feb 5, 2025

wejdross Feb 6, 2025

zugao Feb 5, 2025

wejdross Feb 6, 2025

zugao Feb 6, 2025

zugao left a comment

Add/forgejo #609

Add/forgejo #609

Conversation

wejdross commented Jan 27, 2025 • edited Loading

tobru left a comment

Choose a reason for hiding this comment

wejdross commented Feb 5, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zugao left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zugao left a comment

Choose a reason for hiding this comment

wejdross commented Jan 27, 2025 •

edited

Loading