From 0633c758712ed2aaed3f321531541fd6489fdb79 Mon Sep 17 00:00:00 2001 From: Martin Montes Date: Wed, 10 Apr 2024 10:39:52 +0200 Subject: [PATCH] Revert "Update examples to v0.0.27" This reverts commit 2412d824d98fb4a56b77e21f7fdb7dd40ed34661. --- examples/manifests/connection.yaml | 9 +++++---- examples/manifests/connection_custom_dsn.yaml | 9 +++++---- examples/manifests/mariadb.yaml | 5 +++-- examples/manifests/mariadb_connection.yaml | 5 +++-- examples/manifests/mariadb_from_backup.yaml | 5 +++-- .../mariadb_from_backup_scheduled.yaml | 5 +++-- examples/manifests/mariadb_from_nfs.yaml | 5 +++-- examples/manifests/mariadb_from_pvc.yaml | 5 +++-- examples/manifests/mariadb_from_s3.yaml | 5 +++-- examples/manifests/mariadb_full.yaml | 5 +++-- examples/manifests/mariadb_galera.yaml | 15 ++++++++------ examples/manifests/mariadb_galera_full.yaml | 20 +++++++++++-------- .../manifests/mariadb_galera_maxscale.yaml | 20 +++++++++++-------- examples/manifests/mariadb_loadbalancer.yaml | 5 +++-- examples/manifests/mariadb_metrics.yaml | 5 +++-- examples/manifests/mariadb_metrics_full.yaml | 5 +++-- examples/manifests/mariadb_replication.yaml | 15 ++++++++------ .../manifests/mariadb_replication_full.yaml | 20 +++++++++++-------- .../mariadb_replication_maxscale.yaml | 20 +++++++++++-------- examples/manifests/maxscale.yaml | 5 +++-- examples/manifests/maxscale_external.yaml | 5 +++-- examples/manifests/maxscale_full.yaml | 5 +++-- examples/manifests/maxscale_galera.yaml | 5 +++-- examples/manifests/maxscale_replication.yaml | 5 +++-- 24 files changed, 124 insertions(+), 84 deletions(-) diff --git a/examples/manifests/connection.yaml b/examples/manifests/connection.yaml index e47ea37e..ef8ed686 100644 --- a/examples/manifests/connection.yaml +++ b/examples/manifests/connection.yaml @@ -15,10 +15,11 @@ spec: timeout: "5s" secretName: connection secretTemplate: - labels: - k8s.mariadb.com/connection: sample - annotations: - k8s.mariadb.com/connection: sample + metadata: + labels: + k8s.mariadb.com/connection: sample + annotations: + k8s.mariadb.com/connection: sample key: dsn usernameKey: username passwordKey: password diff --git a/examples/manifests/connection_custom_dsn.yaml b/examples/manifests/connection_custom_dsn.yaml index e6be4ff3..eddd0b57 100644 --- a/examples/manifests/connection_custom_dsn.yaml +++ b/examples/manifests/connection_custom_dsn.yaml @@ -15,10 +15,11 @@ spec: timeout: "5s" secretName: connection secretTemplate: - labels: - k8s.mariadb.com/connection: sample - annotations: - k8s.mariadb.com/connection: sample + metadata: + labels: + k8s.mariadb.com/connection: sample + annotations: + k8s.mariadb.com/connection: sample key: dsn format: mysql://{{ .Username }}:{{ .Password }}@{{ .Host }}:{{ .Port }}/{{ .Database }}{{ .Params }} usernameKey: username diff --git a/examples/manifests/mariadb.yaml b/examples/manifests/mariadb.yaml index b2a0ec3c..2f802b41 100644 --- a/examples/manifests/mariadb.yaml +++ b/examples/manifests/mariadb.yaml @@ -23,8 +23,9 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.20 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.20 myCnf: | [mariadb] diff --git a/examples/manifests/mariadb_connection.yaml b/examples/manifests/mariadb_connection.yaml index 7138fa81..3394cebd 100644 --- a/examples/manifests/mariadb_connection.yaml +++ b/examples/manifests/mariadb_connection.yaml @@ -21,5 +21,6 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.20 \ No newline at end of file + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.20 \ No newline at end of file diff --git a/examples/manifests/mariadb_from_backup.yaml b/examples/manifests/mariadb_from_backup.yaml index 37508628..bc5eae53 100644 --- a/examples/manifests/mariadb_from_backup.yaml +++ b/examples/manifests/mariadb_from_backup.yaml @@ -10,6 +10,7 @@ spec: backupRef: name: backup restoreJob: - labels: - sidecar.istio.io/inject: "false" + metadata: + labels: + sidecar.istio.io/inject: "false" targetRecoveryTime: 2023-12-19T09:00:00Z diff --git a/examples/manifests/mariadb_from_backup_scheduled.yaml b/examples/manifests/mariadb_from_backup_scheduled.yaml index e1770eaf..19e63d65 100644 --- a/examples/manifests/mariadb_from_backup_scheduled.yaml +++ b/examples/manifests/mariadb_from_backup_scheduled.yaml @@ -10,6 +10,7 @@ spec: backupRef: name: backup-scheduled restoreJob: - labels: - sidecar.istio.io/inject: "false" + metadata: + labels: + sidecar.istio.io/inject: "false" targetRecoveryTime: 2023-12-28T09:00:00Z diff --git a/examples/manifests/mariadb_from_nfs.yaml b/examples/manifests/mariadb_from_nfs.yaml index c11f42c7..88ae3604 100644 --- a/examples/manifests/mariadb_from_nfs.yaml +++ b/examples/manifests/mariadb_from_nfs.yaml @@ -12,6 +12,7 @@ spec: server: nas.local path: /volume1/mariadb restoreJob: - labels: - sidecar.istio.io/inject: "false" + metadata: + labels: + sidecar.istio.io/inject: "false" targetRecoveryTime: 2023-12-19T09:00:00Z diff --git a/examples/manifests/mariadb_from_pvc.yaml b/examples/manifests/mariadb_from_pvc.yaml index 21db2bea..d6d1fa72 100644 --- a/examples/manifests/mariadb_from_pvc.yaml +++ b/examples/manifests/mariadb_from_pvc.yaml @@ -11,6 +11,7 @@ spec: persistentVolumeClaim: claimName: backup-scheduled restoreJob: - labels: - sidecar.istio.io/inject: "false" + metadata: + labels: + sidecar.istio.io/inject: "false" targetRecoveryTime: 2023-12-19T09:00:00Z \ No newline at end of file diff --git a/examples/manifests/mariadb_from_s3.yaml b/examples/manifests/mariadb_from_s3.yaml index 9fc97462..696eaa09 100644 --- a/examples/manifests/mariadb_from_s3.yaml +++ b/examples/manifests/mariadb_from_s3.yaml @@ -22,6 +22,7 @@ spec: name: minio-ca key: ca.crt restoreJob: - labels: - sidecar.istio.io/inject: "false" + metadata: + labels: + sidecar.istio.io/inject: "false" targetRecoveryTime: 2023-12-19T09:00:00Z diff --git a/examples/manifests/mariadb_full.yaml b/examples/manifests/mariadb_full.yaml index 73bc68dd..aaa1e673 100644 --- a/examples/manifests/mariadb_full.yaml +++ b/examples/manifests/mariadb_full.yaml @@ -100,8 +100,9 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.20 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.20 externalTrafficPolicy: Cluster sessionAffinity: None diff --git a/examples/manifests/mariadb_galera.yaml b/examples/manifests/mariadb_galera.yaml index 473b203f..31fe87cc 100644 --- a/examples/manifests/mariadb_galera.yaml +++ b/examples/manifests/mariadb_galera.yaml @@ -17,18 +17,21 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.150 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.150 primaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.160 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.160 secondaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.161 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.161 metrics: enabled: true diff --git a/examples/manifests/mariadb_galera_full.yaml b/examples/manifests/mariadb_galera_full.yaml index 50c7979a..ece4f600 100644 --- a/examples/manifests/mariadb_galera_full.yaml +++ b/examples/manifests/mariadb_galera_full.yaml @@ -34,8 +34,9 @@ spec: kubernetesService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.229 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.229 connection: secretName: mxs-galera-conn @@ -82,8 +83,9 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.150 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.150 connection: secretName: mariadb-galera-conn secretTemplate: @@ -91,8 +93,9 @@ spec: primaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.160 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.160 primaryConnection: secretName: mariadb-galera-conn-primary secretTemplate: @@ -100,8 +103,9 @@ spec: secondaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.161 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.161 secondaryConnection: secretName: mariadb-galera-conn-secondary secretTemplate: diff --git a/examples/manifests/mariadb_galera_maxscale.yaml b/examples/manifests/mariadb_galera_maxscale.yaml index 32c65777..43871f1b 100644 --- a/examples/manifests/mariadb_galera_maxscale.yaml +++ b/examples/manifests/mariadb_galera_maxscale.yaml @@ -22,8 +22,9 @@ spec: kubernetesService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.229 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.229 connection: secretName: mxs-galera-conn @@ -34,18 +35,21 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.150 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.150 primaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.160 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.160 secondaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.161 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.161 metrics: enabled: true diff --git a/examples/manifests/mariadb_loadbalancer.yaml b/examples/manifests/mariadb_loadbalancer.yaml index 0ab8a672..caf12dd4 100644 --- a/examples/manifests/mariadb_loadbalancer.yaml +++ b/examples/manifests/mariadb_loadbalancer.yaml @@ -8,7 +8,8 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.20 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.20 externalTrafficPolicy: Cluster sessionAffinity: None \ No newline at end of file diff --git a/examples/manifests/mariadb_metrics.yaml b/examples/manifests/mariadb_metrics.yaml index e0db269c..2b6ad395 100644 --- a/examples/manifests/mariadb_metrics.yaml +++ b/examples/manifests/mariadb_metrics.yaml @@ -8,8 +8,9 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.20 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.20 metrics: enabled: true diff --git a/examples/manifests/mariadb_metrics_full.yaml b/examples/manifests/mariadb_metrics_full.yaml index 47956cfe..b04e7aff 100644 --- a/examples/manifests/mariadb_metrics_full.yaml +++ b/examples/manifests/mariadb_metrics_full.yaml @@ -8,8 +8,9 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.20 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.20 metrics: enabled: true diff --git a/examples/manifests/mariadb_replication.yaml b/examples/manifests/mariadb_replication.yaml index d75e1820..73d5f129 100644 --- a/examples/manifests/mariadb_replication.yaml +++ b/examples/manifests/mariadb_replication.yaml @@ -17,18 +17,21 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.120 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.120 primaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.130 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.130 secondaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.131 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.131 metrics: enabled: true diff --git a/examples/manifests/mariadb_replication_full.yaml b/examples/manifests/mariadb_replication_full.yaml index 031bcaae..9ed11f2c 100644 --- a/examples/manifests/mariadb_replication_full.yaml +++ b/examples/manifests/mariadb_replication_full.yaml @@ -34,8 +34,9 @@ spec: kubernetesService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.219 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.219 connection: secretName: mxs-repl-conn @@ -60,8 +61,9 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.120 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.120 connection: secretName: mariadb-repl-conn secretTemplate: @@ -69,8 +71,9 @@ spec: primaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.130 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.130 primaryConnection: secretName: mariadb-repl-conn-primary secretTemplate: @@ -78,8 +81,9 @@ spec: secondaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.131 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.131 secondaryConnection: secretName: mariadb-repl-conn-secondary secretTemplate: diff --git a/examples/manifests/mariadb_replication_maxscale.yaml b/examples/manifests/mariadb_replication_maxscale.yaml index 3f468a83..170e04e1 100644 --- a/examples/manifests/mariadb_replication_maxscale.yaml +++ b/examples/manifests/mariadb_replication_maxscale.yaml @@ -22,8 +22,9 @@ spec: kubernetesService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.219 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.219 connection: secretName: mxs-repl-conn @@ -34,18 +35,21 @@ spec: service: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.120 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.120 primaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.130 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.130 secondaryService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.131 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.131 metrics: enabled: true \ No newline at end of file diff --git a/examples/manifests/maxscale.yaml b/examples/manifests/maxscale.yaml index d1be8570..cdc2c5d3 100644 --- a/examples/manifests/maxscale.yaml +++ b/examples/manifests/maxscale.yaml @@ -8,5 +8,6 @@ spec: kubernetesService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.224 \ No newline at end of file + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.224 \ No newline at end of file diff --git a/examples/manifests/maxscale_external.yaml b/examples/manifests/maxscale_external.yaml index 96c9652c..9a07a543 100644 --- a/examples/manifests/maxscale_external.yaml +++ b/examples/manifests/maxscale_external.yaml @@ -91,8 +91,9 @@ spec: kubernetesService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.224 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.224 connection: secretName: mxs-galera-conn diff --git a/examples/manifests/maxscale_full.yaml b/examples/manifests/maxscale_full.yaml index 901fd51b..fc089c8e 100644 --- a/examples/manifests/maxscale_full.yaml +++ b/examples/manifests/maxscale_full.yaml @@ -138,8 +138,9 @@ spec: kubernetesService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.224 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.224 connection: secretName: mxs-galera-conn diff --git a/examples/manifests/maxscale_galera.yaml b/examples/manifests/maxscale_galera.yaml index 1b17d2d4..a8735063 100644 --- a/examples/manifests/maxscale_galera.yaml +++ b/examples/manifests/maxscale_galera.yaml @@ -66,8 +66,9 @@ spec: kubernetesService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.224 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.224 connection: secretName: mxs-galera-conn diff --git a/examples/manifests/maxscale_replication.yaml b/examples/manifests/maxscale_replication.yaml index e7807af8..2a2b92de 100644 --- a/examples/manifests/maxscale_replication.yaml +++ b/examples/manifests/maxscale_replication.yaml @@ -66,8 +66,9 @@ spec: kubernetesService: type: LoadBalancer - annotations: - metallb.universe.tf/loadBalancerIPs: 172.18.0.214 + metadata: + annotations: + metallb.universe.tf/loadBalancerIPs: 172.18.0.214 connection: secretName: mxs-repl-conn