Add/forgejo #609
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,7 +103,7 @@ cluster=https://kubernetes.default.svc | |
| push-golden: commodore_args += -f tests/$(instance).yml | ||
| push-golden: clean gen-golden ## Push the target instance to the local forgejo instance, so it can be applied by argocd | ||
| cd tests/golden/$(instance)/appcat/appcat && \ | ||
| git init --initial-branch=master && \ | ||
| git add . && \ | ||
| git commit -m "update" && \ | ||
| git remote add origin http://gitea_admin:[email protected]:8088/gitea_admin/$(repo).git && \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| local com = import 'lib/commodore.libjsonnet'; | ||
| local kap = import 'lib/kapitan.libjsonnet'; | ||
| local kube = import 'lib/kube.libjsonnet'; | ||
|
|
||
| local comp = import 'lib/appcat-compositions.libsonnet'; | ||
| local crossplane = import 'lib/appcat-crossplane.libsonnet'; | ||
|
|
||
| local common = import 'common.libsonnet'; | ||
| local vars = import 'config/vars.jsonnet'; | ||
| local prom = import 'prometheus.libsonnet'; | ||
| local slos = import 'slos.libsonnet'; | ||
| local opsgenieRules = import 'vshn_alerting.jsonnet'; | ||
| local xrds = import 'xrds.libsonnet'; | ||
|
|
||
| local inv = kap.inventory(); | ||
| local params = inv.parameters.appcat; | ||
| local codeyParams = params.services.vshn.codey; | ||
| local appuioManaged = inv.parameters.appcat.appuioManaged; | ||
|
|
||
| local serviceNameLabelKey = 'appcat.vshn.io/servicename'; | ||
| local serviceNamespaceLabelKey = 'appcat.vshn.io/claim-namespace'; | ||
| local serviceCLaimNameLabelKey = 'appcat.vshn.io/claim-name'; | ||
|
|
||
| local connectionSecretKeys = [ | ||
| 'CODEY_USERNAME', | ||
| 'CODEY_PASSWORD', | ||
| 'CODEY_URL', | ||
| ]; | ||
|
|
||
| local isOpenshift = std.startsWith(inv.parameters.facts.distribution, 'openshift') || inv.parameters.facts.distribution == 'oke'; | ||
|
|
||
| local securityContext = if isOpenshift then false else true; | ||
|
|
||
| local codeyPlans = common.FilterDisabledParams(codeyParams.plans); | ||
|
|
||
| local xrd = xrds.XRDFromCRD( | ||
| 'xcodeyinstances.codey.io', | ||
| xrds.LoadCRD('codey.io_codeyinstances.yaml', params.images.appcat.tag), | ||
| defaultComposition='codey.io', | ||
| connectionSecretKeys=connectionSecretKeys, | ||
| ); | ||
|
|
||
| local composition = | ||
| local vshnforgejo = { | ||
| apiVersion: 'vshn.appcat.vshn.io/v1', | ||
| kind: 'XVSHNForgejo', | ||
| metadata: { | ||
| name: 'vshnforgejo', | ||
| }, | ||
| spec: { | ||
| parameters: { | ||
| service: { | ||
| adminEmail: '[email protected]', | ||
| majorVersion: '10.0.0', | ||
| fqdn: [ 'myforgejo.127.0.0.1.nip.io' ], | ||
| }, | ||
| size: { | ||
| plan: 'mini', | ||
| }, | ||
| security: { | ||
| deletionProtection: false, | ||
| }, | ||
| }, | ||
| }, | ||
| }; | ||
|
|
||
|
|
||
| kube._Object('apiextensions.crossplane.io/v1', 'Composition', 'codey.io') + | ||
| common.SyncOptions + | ||
| common.vshnMetaVshnDBaas('instance', 'standalone', 'true', codeyPlans) + | ||
| { | ||
| spec: { | ||
| compositeTypeRef: comp.CompositeRef(xrd), | ||
| writeConnectionSecretsToNamespace: codeyParams.secretNamespace, | ||
| mode: 'Pipeline', | ||
| pipeline: | ||
| [ | ||
| { | ||
| step: 'patch-and-transform', | ||
| functionRef: { | ||
| name: 'function-patch-and-transform', | ||
| }, | ||
| input: { | ||
| apiVersion: 'pt.fn.crossplane.io/v1beta1', | ||
| kind: 'Resources', | ||
| resources: [ | ||
| { | ||
| name: 'vshnforgejo', | ||
| base: vshnforgejo, | ||
| connectionDetails: [ | ||
| { | ||
| name: 'CODEY_PASSWORD', | ||
| type: 'FromConnectionSecretKey', | ||
| fromConnectionSecretKey: 'FORGEJO_PASSWORD', | ||
| }, | ||
| { | ||
| name: 'CODEY_URL', | ||
| type: 'FromConnectionSecretKey', | ||
| fromConnectionSecretKey: 'FORGEJO_URL', | ||
| }, | ||
| { | ||
| name: 'CODEY_USERNAME', | ||
| type: 'FromConnectionSecretKey', | ||
| fromConnectionSecretKey: 'FORGEJO_USERNAME', | ||
| }, | ||
| ], | ||
| patches: [ | ||
| comp.FromCompositeFieldPath('metadata.labels["crossplane.io/composite"]', 'metadata.name'), | ||
| comp.FromCompositeFieldPath('spec.parameters.service.adminEmail', 'spec.parameters.service.adminEmail'), | ||
| comp.FromCompositeFieldPath('spec.parameters.service.majorVersion', 'spec.parameters.service.majorVersion'), | ||
| comp.FromCompositeFieldPathWithTransform('metadata.name', 'spec.parameters.service.fqdn[0]', '', '.app.codey.ch'), | ||
| comp.FromCompositeFieldPath('spec.parameters.size.plan', 'spec.parameters.size.plan'), | ||
| ], | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| }; | ||
|
|
||
| local plansCM = kube.ConfigMap('codeyplans') + { | ||
| metadata+: { | ||
| namespace: params.namespace, | ||
| }, | ||
| data: { | ||
| plans: std.toString(codeyPlans), | ||
| }, | ||
| }; | ||
|
|
||
| if params.services.vshn.enabled && codeyParams.enabled && vars.isSingleOrControlPlaneCluster then { | ||
| '20_xrd_vshn_codey': xrd, | ||
| '20_rbac_vshn_codey': xrds.CompositeClusterRoles(xrd), | ||
| '21_composition_vshn_codey': composition, | ||
| } else {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| apiVersion: kuttl.dev/v1beta1 | ||
| kind: TestAssert | ||
| timeout: 60 | ||
| --- | ||
| apiVersion: vshn.appcat.vshn.io/v1 | ||
| kind: VSHNForgejo | ||
| metadata: | ||
| finalizers: | ||
| - finalizer.apiextensions.crossplane.io | ||
| name: forgejo-e2e | ||
| spec: | ||
| compositionUpdatePolicy: Automatic | ||
| parameters: | ||
| backup: {} | ||
| security: | ||
| allowAllNamespaces: false | ||
| deletionProtection: false | ||
| service: | ||
| adminEmail: [email protected] | ||
| fqdn: | ||
| - somesuperingressname.apps.lab-cloudscale-rma-0.appuio.cloud | ||
| serviceLevel: besteffort | ||
| version: 10.0.0 | ||
| size: | ||
| plan: small | ||
| resourceRef: | ||
| apiVersion: vshn.appcat.vshn.io/v1 | ||
| kind: XVSHNForgejo | ||
| writeConnectionSecretToRef: | ||
| name: mysupersecret | ||
| status: | ||
| conditions: | ||
| - status: "True" | ||
| - status: "True" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
have these plans been agreed already? @tobru
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://kb.vshn.ch/app-catalog/service/forgejo-codey/architecture.html#_codey_plans