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

MariaDB User Management #507

Merged
merged 3 commits into from
Oct 17, 2024
Merged

MariaDB User Management #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9434f9a
[create-pull-request] automated change
Kidswiss Oct 14, 2024
dfad3e3
Update CRDs
Kidswiss Oct 14, 2024
d6c8600
Add RBAC and e2e test
Kidswiss Oct 17, 2024
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: v4.98.0
functionAppcat:
registry: ${appcat:images:appcat:registry}
repository: ${appcat:images:appcat:repository}
Expand Down
5 changes: 5 additions & 0 deletions component/provider.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ local providerRBAC = {
resources: [ 'providerconfigs' ],
verbs: [ 'get', 'list', 'watch', 'update', 'patch', 'create', 'delete' ],
},
{
apiGroups: [ 'mysql.sql.crossplane.io' ],
resources: [ 'providerconfigs' ],
verbs: [ 'get', 'list', 'watch', 'update', 'patch', 'create', 'delete' ],
},
{
apiGroups: [ 'apiextensions.crossplane.io' ],
resources: [ 'usages' ],
Expand Down
6 changes: 4 additions & 2 deletions tests/e2e/mariadb/00-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ kind: VSHNMariaDB
metadata:
finalizers:
- finalizer.apiextensions.crossplane.io
name: mariadb
name: mariadb-e2e
spec:
compositeDeletePolicy: Background
compositionRef:
Expand All @@ -18,6 +18,8 @@ spec:
security:
deletionProtection: true
service:
access:
- user: e2e-test
serviceLevel: besteffort
version: "11.2"
size:
Expand All @@ -43,4 +45,4 @@ metadata:
ownerReferences:
- apiVersion: vshn.appcat.vshn.io/v1
kind: VSHNMariaDB
name: mariadb
name: mariadb-e2e
5 changes: 4 additions & 1 deletion tests/e2e/mariadb/00-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
apiVersion: vshn.appcat.vshn.io/v1
kind: VSHNMariaDB
metadata:
name: mariadb
name: mariadb-e2e
spec:
parameters:
service:
access:
- user: e2e-test
size:
plan: standard-2
writeConnectionSecretToRef:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/mariadb/02-check-protection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kuttl.dev/v1beta1
kind: TestStep
commands:
- script: scripts/check-protection.sh vshnmariadb mariadb
- script: scripts/check-protection.sh vshnmariadb mariadb-e2e
4 changes: 2 additions & 2 deletions tests/e2e/mariadb/03-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ kind: VSHNMariaDB
metadata:
finalizers:
- finalizer.apiextensions.crossplane.io
name: mariadb
name: mariadb-e2e
spec:
compositeDeletePolicy: Background
compositionRef:
Expand Down Expand Up @@ -43,4 +43,4 @@ metadata:
ownerReferences:
- apiVersion: vshn.appcat.vshn.io/v1
kind: VSHNMariaDB
name: mariadb
name: mariadb-e2e
2 changes: 1 addition & 1 deletion tests/e2e/mariadb/03-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: vshn.appcat.vshn.io/v1
kind: VSHNMariaDB
metadata:
name: mariadb
name: mariadb-e2e
spec:
parameters:
security:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/mariadb/99-delete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ delete:
e2e-test: mariadb
- apiVersion: vshn.appcat.vshn.io/v1
kind: VSHNMariaDB
name: mariadb-e2e-test
name: mariadb-e2e
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:v4.98.0-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:v4.98.0
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:v4.98.0-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:v4.98.0
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:v4.98.0
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:v4.98.0-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:v4.98.0
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:v4.98.0
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:v4.98.0-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:v4.98.0
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:v4.98.0
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:v4.98.0-func
runtimeConfigRef:
name: function-appcat
12 changes: 12 additions & 0 deletions tests/golden/cloudscale/appcat/appcat/10_provider_kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,18 @@ rules:
- patch
- create
- delete
- apiGroups:
- mysql.sql.crossplane.io
resources:
- providerconfigs
verbs:
- get
- list
- watch
- update
- patch
- create
- delete
- apiGroups:
- apiextensions.crossplane.io
resources:
Expand Down
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:v4.98.0
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:v4.98.0-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:v4.98.0
livenessProbe:
failureThreshold: 3
httpGet:
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:v4.98.0
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:v4.98.0-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:v4.98.0
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:v4.98.0
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:v4.98.0-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:v4.98.0
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:v4.98.0
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:v4.98.0-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:v4.98.0
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:v4.98.0
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:v4.98.0-func
runtimeConfigRef:
name: function-appcat
12 changes: 12 additions & 0 deletions tests/golden/exoscale/appcat/appcat/10_provider_kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,18 @@ rules:
- patch
- create
- delete
- apiGroups:
- mysql.sql.crossplane.io
resources:
- providerconfigs
verbs:
- get
- list
- watch
- update
- patch
- create
- delete
- apiGroups:
- apiextensions.crossplane.io
resources:
Expand Down
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:v4.98.0
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:v4.98.0-func
runtimeConfigRef:
name: function-appcat
12 changes: 12 additions & 0 deletions tests/golden/minio/appcat/appcat/10_provider_kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,18 @@ rules:
- patch
- create
- delete
- apiGroups:
- mysql.sql.crossplane.io
resources:
- providerconfigs
verbs:
- get
- list
- watch
- update
- patch
- create
- delete
- apiGroups:
- apiextensions.crossplane.io
resources:
Expand Down
Loading