Skip to content
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

Jump to bottom

PR for appcat on spks/deletion_protection #510

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

PR for appcat on spks/deletion_protection #510

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 @@ -55,7 +55,7 @@ parameters:
appcat:
registry: ghcr.io
repository: vshn/appcat
tag: v4.97.2
tag: spks/deletion_protection
functionAppcat:
registry: ${appcat:images:appcat:registry}
repository: ${appcat:images:appcat:repository}
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/billing/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
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 @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
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 @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
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 @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/cloudscale/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/controllers/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/controllers/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
19 changes: 19 additions & 0 deletions tests/golden/controllers/appcat/appcat/controllers/appcat/10_webhooks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,25 @@ webhooks:
resources:
- persistentvolumeclaims
sideEffects: None
- admissionReviewVersions:
- v1
clientConfig:
service:
name: webhook-service
namespace: syn-appcat
path: /validate-helm-crossplane-io-v1beta1-release
failurePolicy: Fail
name: releases.vshn.appcat.vshn.io
rules:
- apiGroups:
- helm.crossplane.io
apiVersions:
- v1beta1
operations:
- DELETE
resources:
- releases
sideEffects: None
- admissionReviewVersions:
- v1
clientConfig:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
env:
- name: PLANS_NAMESPACE
value: syn-appcat
image: ghcr.io/vshn/appcat:v4.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
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 @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
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 @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
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 @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/exoscale-metrics-collector-managed/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
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 @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/exoscale/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/minio/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
emailAlertingSmtpFromAddress: myuser@example.com
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
emailAlertingSmtpUsername: myuser@example.com
imageTag: v4.97.2
imageTag: spks_deletion_protection
isOpenshift: 'false'
maintenanceSA: helm-based-service-maintenance
minioChartRepository: https://charts.min.io
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/minio/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
19 changes: 19 additions & 0 deletions tests/golden/minio/appcat/appcat/controllers/appcat/10_webhooks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,25 @@ webhooks:
resources:
- persistentvolumeclaims
sideEffects: None
- admissionReviewVersions:
- v1
clientConfig:
service:
name: webhook-service
namespace: syn-appcat
path: /validate-helm-crossplane-io-v1beta1-release
failurePolicy: Fail
name: releases.vshn.appcat.vshn.io
rules:
- apiGroups:
- helm.crossplane.io
apiVersions:
- v1beta1
operations:
- DELETE
resources:
- releases
sideEffects: None
- admissionReviewVersions:
- v1
clientConfig:
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
env:
- name: PLANS_NAMESPACE
value: syn-appcat
image: ghcr.io/vshn/appcat:v4.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/minio/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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
name: sla-reporter
resources:
limits:
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 @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/openshift/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
2 changes: 1 addition & 1 deletion tests/golden/openshift/appcat/appcat/21_composition_vshn_postgres.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
emailAlertingSmtpUsername: myuser@example.com
externalDatabaseConnectionsEnabled: 'false'
imageTag: v4.97.2
imageTag: spks_deletion_protection
initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m",
"memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile":
{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m",
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ spec:
emailAlertingSmtpFromAddress: myuser@example.com
emailAlertingSmtpHost: smtp.eu.mailgun.org:465
emailAlertingSmtpUsername: myuser@example.com
imageTag: v4.97.2
imageTag: spks_deletion_protection
isOpenshift: 'true'
maintenanceSA: helm-based-service-maintenance
ownerGroup: vshn.appcat.vshn.io
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/openshift/appcat/appcat/apiserver/30_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
failureThreshold: 3
httpGet:
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 @@ -36,7 +36,7 @@ spec:
value: "false"
- name: APPCAT_SLI_VSHNMARIADB
value: "false"
image: ghcr.io/vshn/appcat:v4.97.2
image: ghcr.io/vshn/appcat:spks_deletion_protection
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/vshn/appcat/appcat/10_function_appcat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Function
metadata:
name: function-appcat
spec:
package: ghcr.io/vshn/appcat:v4.97.2-func
package: ghcr.io/vshn/appcat:spks_deletion_protection-func
runtimeConfigRef:
name: function-appcat
Loading
Loading