Skip to content
Merged
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
8 changes: 4 additions & 4 deletions class/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ parameters:
repository: vshn/provider-minio
tag: v0.4.4
provider-sql:
registry: xpkg.upbound.io
repository: crossplane-contrib/provider-sql
tag: v0.11.0
registry: ghcr.io
repository: vshn/provider-sql
tag: v0.11.0-vshn
sloth:
registry: ghcr.io
image: slok/sloth
Expand All @@ -61,7 +61,7 @@ parameters:
appcat:
registry: ghcr.io
repository: vshn/appcat
tag: develop
tag: add/schema-grants
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-develop
name: function-appcat-master-add-schema-grants
spec:
package: ghcr.io/vshn/appcat:develop-func
package: ghcr.io/vshn/appcat:add_schema-grants-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
name: provider-sql
name: provider-sql
spec:
package: xpkg.upbound.io/crossplane-contrib/provider-sql:v0.11.0
package: ghcr.io/vshn/provider-sql:v0.11.0-vshn
runtimeConfigRef:
name: provider-sql
---
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-develop
name: function-appcat-master-add-schema-grants
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-develop
metadata.appcat.vshn.io/revision: master-add_schema-grants
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-develop
metadata.appcat.vshn.io/revision: master-add_schema-grants
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-develop
name: function-appcat-master-add-schema-grants
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
ignoreNamespaceForBilling: vshn-test
imageRegistry: code.forgejo.org
imageTag: develop
imageTag: add_schema-grants
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-develop
metadata.appcat.vshn.io/revision: master-add_schema-grants
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-develop
name: function-appcat-master-add-schema-grants
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
imageTag: develop
imageTag: add_schema-grants
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-develop
metadata.appcat.vshn.io/revision: master-add_schema-grants
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-develop
name: function-appcat-master-add-schema-grants
input:
apiVersion: v1
data:
Expand All @@ -42,7 +42,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: develop
imageTag: add_schema-grants
isOpenshift: 'false'
maintenanceSA: helm-based-service-maintenance
mode: standalone
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-develop
metadata.appcat.vshn.io/revision: master-add_schema-grants
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-develop
name: function-appcat-master-add-schema-grants
input:
apiVersion: v1
data:
Expand All @@ -49,7 +49,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: develop
imageTag: add_schema-grants
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-develop
metadata.appcat.vshn.io/revision: master-add_schema-grants
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-develop
name: function-appcat-master-add-schema-grants
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
externalDatabaseConnectionsEnabled: 'true'
ignoreNamespaceForBilling: vshn-test
imageTag: develop
imageTag: add_schema-grants
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 @@ -17,7 +17,7 @@ metadata:
metadata.appcat.vshn.io/zone: rma1
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: master-develop
metadata.appcat.vshn.io/revision: master-add_schema-grants
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-develop
name: function-appcat-master-add-schema-grants
input:
apiVersion: v1
data:
Expand All @@ -46,7 +46,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
ignoreNamespaceForBilling: vshn-test
imageRegistry: docker.io
imageTag: develop
imageTag: add_schema-grants
isOpenshift: 'false'
maintenanceSA: helm-based-service-maintenance
mode: standalone
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:develop
image: ghcr.io/vshn/appcat:add_schema-grants
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
env:
- name: PLANS_NAMESPACE
value: syn-appcat
image: ghcr.io/vshn/appcat:develop
image: ghcr.io/vshn/appcat:add_schema-grants
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: develop
function-revision: add/schema-grants
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: develop
function-revision: add/schema-grants
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:develop
image: ghcr.io/vshn/appcat:add_schema-grants
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-develop
name: function-appcat-master-add-schema-grants
spec:
package: ghcr.io/vshn/appcat:develop-func
package: ghcr.io/vshn/appcat:add_schema-grants-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: function-appcat
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/defaults/appcat/appcat/10_provider_sql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
name: provider-sql
name: provider-sql
spec:
package: xpkg.upbound.io/crossplane-contrib/provider-sql:v0.11.0
package: ghcr.io/vshn/provider-sql:v0.11.0-vshn
runtimeConfigRef:
name: provider-sql
---
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:develop
image: ghcr.io/vshn/appcat:add_schema-grants
livenessProbe:
failureThreshold: 3
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: develop
function-revision: add/schema-grants
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: develop
function-revision: add/schema-grants
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:develop
image: ghcr.io/vshn/appcat:add_schema-grants
livenessProbe:
httpGet:
path: /healthz
Expand Down
4 changes: 2 additions & 2 deletions tests/golden/dev/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-develop
name: function-appcat-debug-add-schema-grants
spec:
package: ghcr.io/vshn/appcat:develop-func
package: ghcr.io/vshn/appcat:add_schema-grants-func
packagePullPolicy: IfNotPresent
runtimeConfigRef:
name: enable-proxy
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/dev/appcat/appcat/10_provider_sql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
name: provider-sql
name: provider-sql
spec:
package: xpkg.upbound.io/crossplane-contrib/provider-sql:v0.11.0
package: ghcr.io/vshn/provider-sql:v0.11.0-vshn
runtimeConfigRef:
name: provider-sql
---
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-develop
name: function-appcat-debug-add-schema-grants
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-develop
metadata.appcat.vshn.io/revision: debug-add_schema-grants
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: lpg
labels:
metadata.appcat.vshn.io/offered: 'true'
metadata.appcat.vshn.io/revision: debug-develop
metadata.appcat.vshn.io/revision: debug-add_schema-grants
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-develop
name: function-appcat-debug-add-schema-grants
input:
apiVersion: v1
data:
Expand All @@ -43,7 +43,7 @@ spec:
emailAlertingSmtpUsername: [email protected]
ignoreNamespaceForBilling: vshn-test
imageRegistry: code.forgejo.org
imageTag: develop
imageTag: add_schema-grants
ingress_annotations: |
cert-manager.io/cluster-issuer: letsencrypt-production
isOpenshift: 'false'
Expand Down
Loading