Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 class/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ parameters:
appcat:
registry: ghcr.io
repository: vshn/appcat
tag: 2e7c65656ed82828dbceb4a1196c17d128a2033f
tag: enable-forgejo-billing
functionAppcat:
registry: ${appcat:images:appcat:registry}
repository: ${appcat:images:appcat:repository}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-master-enable-forgejo-billing
spec:
package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func
package: ghcr.io/vshn/appcat:enable-forgejo-billing-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-master-enable-forgejo-billing
input:
apiVersion: v1
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f
metadata.appcat.vshn.io/revision: master-enable-forgejo-billing
metadata.appcat.vshn.io/serviceID: vshn-codey
name: codey.io
name: codey.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f
metadata.appcat.vshn.io/revision: master-enable-forgejo-billing
metadata.appcat.vshn.io/serviceID: vshn-forgejo
name: vshnforgejo.vshn.appcat.vshn.io
name: vshnforgejo.vshn.appcat.vshn.io
Expand All @@ -24,7 +24,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-master-enable-forgejo-billing
input:
apiVersion: v1
data:
Expand All @@ -49,7 +49,7 @@ spec:
httpGatewayNamespace: ''
ignoreNamespaceForBilling: vshn-test
imageRegistry: code.forgejo.org
imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f
imageTag: enable-forgejo-billing
ingress_annotations: |
cert-manager.io/cluster-issuer: letsencrypt-production
isOpenshift: 'false'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f
metadata.appcat.vshn.io/revision: master-enable-forgejo-billing
metadata.appcat.vshn.io/serviceID: vshn-garage
name: vshngarage.vshn.appcat.vshn.io
name: vshngarage.vshn.appcat.vshn.io
Expand All @@ -24,7 +24,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-master-enable-forgejo-billing
input:
apiVersion: v1
data:
Expand All @@ -48,7 +48,7 @@ spec:
httpGatewayNamespace: ''
ignoreNamespaceForBilling: vshn-test
imageRegistry: ''
imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f
imageTag: enable-forgejo-billing
isOpenshift: 'false'
maintenanceSA: helm-based-service-maintenance
maintenanceURL: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f
metadata.appcat.vshn.io/revision: master-enable-forgejo-billing
metadata.appcat.vshn.io/serviceID: vshn-keycloak
name: vshnkeycloak.vshn.appcat.vshn.io
name: vshnkeycloak.vshn.appcat.vshn.io
Expand All @@ -24,7 +24,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-master-enable-forgejo-billing
input:
apiVersion: v1
data:
Expand Down Expand Up @@ -54,7 +54,7 @@ spec:
httpGatewayNamespace: ''
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f
imageTag: enable-forgejo-billing
ingress_annotations: |
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
cert-manager.io/cluster-issuer: letsencrypt-staging
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f
metadata.appcat.vshn.io/revision: master-enable-forgejo-billing
metadata.appcat.vshn.io/serviceID: vshn-mariadb
name: vshnmariadb.vshn.appcat.vshn.io
name: vshnmariadb.vshn.appcat.vshn.io
Expand All @@ -24,7 +24,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-master-enable-forgejo-billing
input:
apiVersion: v1
data:
Expand All @@ -49,7 +49,7 @@ spec:
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageRepositoryPrefix: bitnamilegacy
imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f
imageTag: enable-forgejo-billing
isOpenshift: 'false'
maintenanceSA: helm-based-service-maintenance
maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f
metadata.appcat.vshn.io/revision: master-enable-forgejo-billing
metadata.appcat.vshn.io/serviceID: vshn-nextcloud
name: vshnnextcloud.vshn.appcat.vshn.io
name: vshnnextcloud.vshn.appcat.vshn.io
Expand All @@ -24,7 +24,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-master-enable-forgejo-billing
input:
apiVersion: v1
data:
Expand Down Expand Up @@ -57,7 +57,7 @@ spec:
httpGatewayNamespace: ''
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f
imageTag: enable-forgejo-billing
ingress_annotations: |
cert-manager.io/cluster-issuer: letsencrypt-staging
nginx.ingress.kubernetes.io/enable-cors: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f
metadata.appcat.vshn.io/revision: master-enable-forgejo-billing
metadata.appcat.vshn.io/serviceID: vshn-postgresql
name: vshnpostgres.vshn.appcat.vshn.io
name: vshnpostgres.vshn.appcat.vshn.io
Expand All @@ -26,7 +26,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-master-enable-forgejo-billing
input:
apiVersion: v1
data:
Expand All @@ -52,7 +52,7 @@ spec:
httpGatewayName: ''
httpGatewayNamespace: ''
ignoreNamespaceForBilling: vshn-test
imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f
imageTag: enable-forgejo-billing
initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
"memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f
metadata.appcat.vshn.io/revision: master-enable-forgejo-billing
metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg
name: vshnpostgrescnpg.vshn.appcat.vshn.io
name: vshnpostgrescnpg.vshn.appcat.vshn.io
Expand All @@ -26,7 +26,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-master-enable-forgejo-billing
input:
apiVersion: v1
data:
Expand All @@ -52,7 +52,7 @@ spec:
httpGatewayName: ''
httpGatewayNamespace: ''
ignoreNamespaceForBilling: vshn-test
imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f
imageTag: enable-forgejo-billing
isOpenshift: 'false'
kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15
loadbalancerAnnotations: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-2e7c65656ed82828dbceb4a1196c17d128a2033f
metadata.appcat.vshn.io/revision: master-enable-forgejo-billing
metadata.appcat.vshn.io/serviceID: vshn-redis
name: vshnredis.vshn.appcat.vshn.io
name: vshnredis.vshn.appcat.vshn.io
Expand All @@ -28,7 +28,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-master-enable-forgejo-billing
input:
apiVersion: v1
data:
Expand All @@ -54,7 +54,7 @@ spec:
ignoreNamespaceForBilling: vshn-test
imageRegistry: ghcr.io
imageRepositoryPrefix: vshn
imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f
imageTag: enable-forgejo-billing
isOpenshift: 'false'
kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15
maintenanceSA: helm-based-service-maintenance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
- --secure-port=9443
- --tls-cert-file=/apiserver.local.config/certificates/tls.crt
- --tls-private-key-file=/apiserver.local.config/certificates/tls.key
image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f
image: ghcr.io/vshn/appcat:enable-forgejo-billing
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
}
- name: CROSSPLANE_EXTRA_RESOURCES
value: ''
image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f
image: ghcr.io/vshn/appcat:enable-forgejo-billing
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f
function-revision: enable-forgejo-billing
labels:
app: crossplane
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f
function-revision: enable-forgejo-billing
labels:
app: crossplane-rbac-manager
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
envFrom:
- secretRef:
name: appcat-sla-reports-creds
image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f
image: ghcr.io/vshn/appcat:enable-forgejo-billing
name: sla-reporter
resources:
limits:
Expand Down
4 changes: 2 additions & 2 deletions tests/golden/defaults/appcat/appcat/10_function_appcat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-master-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-master-enable-forgejo-billing
spec:
package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func
package: ghcr.io/vshn/appcat:enable-forgejo-billing-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
- --secure-port=9443
- --tls-cert-file=/apiserver.local.config/certificates/tls.crt
- --tls-private-key-file=/apiserver.local.config/certificates/tls.key
image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f
image: ghcr.io/vshn/appcat:enable-forgejo-billing
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f
function-revision: enable-forgejo-billing
labels:
app: crossplane
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: 2e7c65656ed82828dbceb4a1196c17d128a2033f
function-revision: enable-forgejo-billing
labels:
app: crossplane-rbac-manager
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
- --health-probe-bind-address=:8081
- --metrics-bind-address=127.0.0.1:8080
env: []
image: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f
image: ghcr.io/vshn/appcat:enable-forgejo-billing
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: '-40'
name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-debug-enable-forgejo-billing
spec:
package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func
package: ghcr.io/vshn/appcat:enable-forgejo-billing-func
packagePullPolicy: Always
runtimeConfigRef:
name: enable-proxy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
mode: Pipeline
pipeline:
- functionRef:
name: function-appcat-debug-2e7c65656ed82828dbceb4a1196c17d128a2033f
name: function-appcat-debug-enable-forgejo-billing
input:
apiVersion: v1
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
metadata.appcat.vshn.io/zone: lpg
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: debug-2e7c65656ed82828dbceb4a1196c17d128a2033f
metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing
metadata.appcat.vshn.io/serviceID: vshn-codey
name: codey.io
name: codey.io
Expand Down
Loading
Loading