Skip to content

Revert "Disable billing controller via flag by default" #952

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

Open
vshnbot wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Revert "Disable billing controller via flag by default" #952

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 class/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ parameters:
appcat:
registry: ghcr.io
repository: vshn/appcat
tag: v4.171.0
tag: revert-503-fix/billing-disable
functionAppcat:
registry: ${appcat:images:appcat:registry}
repository: ${appcat:images:appcat:repository}
Expand Down
4 changes: 2 additions & 2 deletions tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
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-v4-171-0
name: function-appcat-master-revert-503-fix-billing-disable
spec:
package: ghcr.io/vshn/appcat:v4.171.0-func
package: ghcr.io/vshn/appcat:revert-503-fix_billing-disable-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/control-plane/appcat/appcat/21_composition_objectstorage_minio.yaml
View file
Open in desktop
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-v4-171-0
name: function-appcat-master-revert-503-fix-billing-disable
input:
apiVersion: v1
data:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/control-plane/appcat/appcat/21_composition_vshn_codey.yaml
View file
Open in desktop
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-v4.171.0
metadata.appcat.vshn.io/revision: master-revert-503-fix_billing-disable
metadata.appcat.vshn.io/serviceID: vshn-codey
name: codey.io
name: codey.io
Expand Down
6 changes: 3 additions & 3 deletions tests/golden/control-plane/appcat/appcat/21_composition_vshn_forgejo.yaml
View file
Open in desktop
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-v4.171.0
metadata.appcat.vshn.io/revision: master-revert-503-fix_billing-disable
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-v4-171-0
name: function-appcat-master-revert-503-fix-billing-disable
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: code.forgejo.org
imageTag: v4.171.0
imageTag: revert-503-fix_billing-disable
ingress_annotations: |
cert-manager.io/cluster-issuer: letsencrypt-production
isOpenshift: 'false'
Expand Down
6 changes: 3 additions & 3 deletions tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml
View file
Open in desktop
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-v4.171.0
metadata.appcat.vshn.io/revision: master-revert-503-fix_billing-disable
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-v4-171-0
name: function-appcat-master-revert-503-fix-billing-disable
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
imageTag: v4.171.0
imageTag: revert-503-fix_billing-disable
ingress_annotations: |
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
cert-manager.io/cluster-issuer: letsencrypt-staging
Expand Down
6 changes: 3 additions & 3 deletions tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml
View file
Open in desktop
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-v4.171.0
metadata.appcat.vshn.io/revision: master-revert-503-fix_billing-disable
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-v4-171-0
name: function-appcat-master-revert-503-fix-billing-disable
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageRepositoryPrefix: bitnamilegacy
imageTag: v4.171.0
imageTag: revert-503-fix_billing-disable
isOpenshift: 'false'
maintenanceSA: helm-based-service-maintenance
maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100
Expand Down
6 changes: 3 additions & 3 deletions tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml
View file
Open in desktop
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-v4.171.0
metadata.appcat.vshn.io/revision: master-revert-503-fix_billing-disable
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-v4-171-0
name: function-appcat-master-revert-503-fix-billing-disable
input:
apiVersion: v1
data:
Expand All @@ -49,7 +49,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: v4.171.0
imageTag: revert-503-fix_billing-disable
ingress_annotations: |
cert-manager.io/cluster-issuer: letsencrypt-staging
nginx.ingress.kubernetes.io/enable-cors: "true"
Expand Down
6 changes: 3 additions & 3 deletions tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml
View file
Open in desktop
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-v4.171.0
metadata.appcat.vshn.io/revision: master-revert-503-fix_billing-disable
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-v4-171-0
name: function-appcat-master-revert-503-fix-billing-disable
input:
apiVersion: v1
data:
Expand All @@ -46,7 +46,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
externalDatabaseConnectionsEnabled: 'true'
ignoreNamespaceForBilling: vshn-test
imageTag: v4.171.0
imageTag: revert-503-fix_billing-disable
initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
"memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",
Expand Down
6 changes: 3 additions & 3 deletions tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.yaml
View file
Open in desktop
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-v4.171.0
metadata.appcat.vshn.io/revision: master-revert-503-fix_billing-disable
metadata.appcat.vshn.io/serviceID: vshn-postgresql
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-v4-171-0
name: function-appcat-master-revert-503-fix-billing-disable
input:
apiVersion: v1
data:
Expand All @@ -46,7 +46,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
externalDatabaseConnectionsEnabled: 'true'
ignoreNamespaceForBilling: vshn-test
imageTag: v4.171.0
imageTag: revert-503-fix_billing-disable
isOpenshift: 'false'
kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15
loadbalancerAnnotations: |
Expand Down
6 changes: 3 additions & 3 deletions tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml
View file
Open in desktop
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-v4.171.0
metadata.appcat.vshn.io/revision: master-revert-503-fix_billing-disable
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-v4-171-0
name: function-appcat-master-revert-503-fix-billing-disable
input:
apiVersion: v1
data:
Expand All @@ -47,7 +47,7 @@ spec:
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageRepositoryPrefix: bitnamilegacy
imageTag: v4.171.0
imageTag: revert-503-fix_billing-disable
isOpenshift: 'false'
kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15
maintenanceSA: helm-based-service-maintenance
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
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:v4.171.0
image: ghcr.io/vshn/appcat:revert-503-fix_billing-disable
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
env:
- name: PLANS_NAMESPACE
value: syn-appcat
image: ghcr.io/vshn/appcat:v4.171.0
image: ghcr.io/vshn/appcat:revert-503-fix_billing-disable
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion ...den/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: v4.171.0
function-revision: revert-503-fix/billing-disable
labels:
app: crossplane
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
2 changes: 1 addition & 1 deletion ...lane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: v4.171.0
function-revision: revert-503-fix/billing-disable
labels:
app: crossplane-rbac-manager
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml
View file
Open in desktop
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:v4.171.0
image: ghcr.io/vshn/appcat:revert-503-fix_billing-disable
name: sla-reporter
resources:
limits:
Expand Down
4 changes: 2 additions & 2 deletions tests/golden/defaults/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
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-v4-171-0
name: function-appcat-master-revert-503-fix-billing-disable
spec:
package: ghcr.io/vshn/appcat:v4.171.0-func
package: ghcr.io/vshn/appcat:revert-503-fix_billing-disable-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
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:v4.171.0
image: ghcr.io/vshn/appcat:revert-503-fix_billing-disable
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion ...s/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: v4.171.0
function-revision: revert-503-fix/billing-disable
labels:
app: crossplane
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
2 changes: 1 addition & 1 deletion ...ults/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
template:
metadata:
annotations:
function-revision: v4.171.0
function-revision: revert-503-fix/billing-disable
labels:
app: crossplane-rbac-manager
app.kubernetes.io/component: cloud-infrastructure-controller
Expand Down
2 changes: 1 addition & 1 deletion .../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
View file
Open in desktop
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:v4.171.0
image: ghcr.io/vshn/appcat:revert-503-fix_billing-disable
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions tests/golden/dev/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
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-v4-171-0
name: function-appcat-debug-revert-503-fix-billing-disable
spec:
package: ghcr.io/vshn/appcat:v4.171.0-func
package: ghcr.io/vshn/appcat:revert-503-fix_billing-disable-func
packagePullPolicy: Always
runtimeConfigRef:
name: enable-proxy
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/dev/appcat/appcat/21_composition_objectstorage_minio.yaml
View file
Open in desktop
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-v4-171-0
name: function-appcat-debug-revert-503-fix-billing-disable
input:
apiVersion: v1
data:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/dev/appcat/appcat/21_composition_vshn_codey.yaml
View file
Open in desktop
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-v4.171.0
metadata.appcat.vshn.io/revision: debug-revert-503-fix_billing-disable
metadata.appcat.vshn.io/serviceID: vshn-codey
name: codey.io
name: codey.io
Expand Down
6 changes: 3 additions & 3 deletions tests/golden/dev/appcat/appcat/21_composition_vshn_forgejo.yaml
View file
Open in desktop
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-v4.171.0
metadata.appcat.vshn.io/revision: debug-revert-503-fix_billing-disable
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-debug-v4-171-0
name: function-appcat-debug-revert-503-fix-billing-disable
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: appcat@appuio.cloud
ignoreNamespaceForBilling: vshn-test
imageRegistry: code.forgejo.org
imageTag: v4.171.0
imageTag: revert-503-fix_billing-disable
ingress_annotations: |
cert-manager.io/cluster-issuer: letsencrypt-production
isOpenshift: 'false'
Expand Down
Loading
Loading