From 24c7efac577214aca17cb014eb53eeb019aed289 Mon Sep 17 00:00:00 2001 From: Edgar Lanting Date: Mon, 12 Apr 2021 15:40:26 +0200 Subject: [PATCH 1/4] Metrics examples & assorted changes What has been done: - Two new examples containing metrics sidecar information a well as metrics related annotations. - Changed the `v1alpha` apiVersion to `v1` - Changed the ArangoDB version to `3.7.10`. - Walked through all examples for validity. --- examples/arango-local-storage.yaml | 2 +- examples/cluster1-with-sync.yaml | 4 ++-- examples/cluster2-with-sync.yaml | 4 ++-- examples/production-cluster-with-metrics.yaml | 17 +++++++++++++++++ examples/production-cluster.yaml | 4 ++-- examples/reboot-pod.yaml | 4 ++-- examples/simple-cluster-no-tls.yaml | 2 +- examples/simple-cluster-with-metrics.yaml | 16 ++++++++++++++++ examples/simple-cluster.yaml | 4 ++-- examples/single-server-no-auth.yaml | 2 +- examples/single-server.yaml | 4 ++-- 11 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 examples/production-cluster-with-metrics.yaml create mode 100644 examples/simple-cluster-with-metrics.yaml diff --git a/examples/arango-local-storage.yaml b/examples/arango-local-storage.yaml index 6c986ecd0..f6771914b 100644 --- a/examples/arango-local-storage.yaml +++ b/examples/arango-local-storage.yaml @@ -1,4 +1,4 @@ -apiVersion: "storage.arangodb.com/v1alpha" +apiVersion: "storage.arangodb.com/v1" kind: "ArangoLocalStorage" metadata: name: "arangodb-local-storage" diff --git a/examples/cluster1-with-sync.yaml b/examples/cluster1-with-sync.yaml index 0386e309c..fb767405d 100644 --- a/examples/cluster1-with-sync.yaml +++ b/examples/cluster1-with-sync.yaml @@ -1,10 +1,10 @@ -apiVersion: "database.arangodb.com/v1alpha" +apiVersion: "database.arangodb.com/v1" kind: "ArangoDeployment" metadata: name: "cluster1-with-sync" spec: mode: Cluster - image: arangodb/arangodb:3.6.1 + image: 'arangodb/arangodb:3.7.10' tls: altNames: ["kube-01", "kube-02", "kube-03"] sync: diff --git a/examples/cluster2-with-sync.yaml b/examples/cluster2-with-sync.yaml index 8deb8e721..9ec5bbca3 100644 --- a/examples/cluster2-with-sync.yaml +++ b/examples/cluster2-with-sync.yaml @@ -1,10 +1,10 @@ -apiVersion: "database.arangodb.com/v1alpha" +apiVersion: "database.arangodb.com/v1" kind: "ArangoDeployment" metadata: name: "cluster2-with-sync" spec: mode: Cluster - image: arangodb/arangodb:3.6.1 + image: 'arangodb/arangodb:3.7.10' tls: altNames: ["kube-01", "kube-02", "kube-03"] sync: diff --git a/examples/production-cluster-with-metrics.yaml b/examples/production-cluster-with-metrics.yaml new file mode 100644 index 000000000..2540caf92 --- /dev/null +++ b/examples/production-cluster-with-metrics.yaml @@ -0,0 +1,17 @@ +apiVersion: "database.arangodb.com/v1" +kind: "ArangoDeployment" +metadata: + name: "production-cluster" +spec: + metrics: + mode: sidecar + enabled: true + image: 'arangodb/arangodb-exporter:0.1.7' + tls: false + annotations: + prometheus.io/scrape: 'true' + prometheus.io/port: '9101' + prometheus.io/scrape_interval: '5s' + mode: Cluster + image: arangodb/arangodb:3.7.10' + environment: Production diff --git a/examples/production-cluster.yaml b/examples/production-cluster.yaml index 9abacf37b..2fef864b4 100644 --- a/examples/production-cluster.yaml +++ b/examples/production-cluster.yaml @@ -1,8 +1,8 @@ -apiVersion: "database.arangodb.com/v1alpha" +apiVersion: "database.arangodb.com/v1" kind: "ArangoDeployment" metadata: name: "production-cluster" spec: mode: Cluster - image: arangodb/arangodb:3.6.1 + image: 'arangodb/arangodb:3.7.10' environment: Production diff --git a/examples/reboot-pod.yaml b/examples/reboot-pod.yaml index eb111f2c5..7794d6ec9 100644 --- a/examples/reboot-pod.yaml +++ b/examples/reboot-pod.yaml @@ -6,12 +6,12 @@ spec: restartPolicy: Never serviceAccountName: arango-deployment-operator-reboot containers: - - image: arangodb/kube-arangodb:1.1.6 + - image: 'arangodb/kube-arangodb:1.1.5' name: reboot command: ["arangodb_operator", "reboot"] args: - --deployment-name=my-arangodb-cluster - - --image-name=arangodb/enterprise:3.6.1 + - --image-name=arangodb/enterprise:3.7.10 - --license-secret-name=arangodb-license-key - --coordinators=3 - pvc-9aa241f7-df94-11e9-b74c-42010aac0044 diff --git a/examples/simple-cluster-no-tls.yaml b/examples/simple-cluster-no-tls.yaml index 8d21dadc1..aa991c3af 100644 --- a/examples/simple-cluster-no-tls.yaml +++ b/examples/simple-cluster-no-tls.yaml @@ -1,4 +1,4 @@ -apiVersion: "database.arangodb.com/v1alpha" +apiVersion: "database.arangodb.com/v1" kind: "ArangoDeployment" metadata: name: "example-simple-cluster-no-tls" diff --git a/examples/simple-cluster-with-metrics.yaml b/examples/simple-cluster-with-metrics.yaml new file mode 100644 index 000000000..6414116dc --- /dev/null +++ b/examples/simple-cluster-with-metrics.yaml @@ -0,0 +1,16 @@ +apiVersion: "database.arangodb.com/v1" +kind: "ArangoDeployment" +metadata: + name: "example-simple-cluster" +spec: + metrics: + mode: sidecar + enabled: true + image: 'arangodb/arangodb-exporter:0.1.7' + tls: false + annotations: + prometheus.io/scrape: 'true' + prometheus.io/port: '9101' + prometheus.io/scrape_interval: '5s' + mode: Cluster + image: 'arangodb/arangodb:3.7.10' diff --git a/examples/simple-cluster.yaml b/examples/simple-cluster.yaml index 4494f94a8..fb62ef2ab 100644 --- a/examples/simple-cluster.yaml +++ b/examples/simple-cluster.yaml @@ -1,7 +1,7 @@ -apiVersion: "database.arangodb.com/v1alpha" +apiVersion: "database.arangodb.com/v1" kind: "ArangoDeployment" metadata: name: "example-simple-cluster" spec: mode: Cluster - image: arangodb/arangodb:3.6.1 + image: 'arangodb/arangodb:3.7.10' diff --git a/examples/single-server-no-auth.yaml b/examples/single-server-no-auth.yaml index b2153f674..2dbeddc06 100644 --- a/examples/single-server-no-auth.yaml +++ b/examples/single-server-no-auth.yaml @@ -1,4 +1,4 @@ -apiVersion: "database.arangodb.com/v1alpha" +apiVersion: "database.arangodb.com/v1" kind: "ArangoDeployment" metadata: name: "example-simple-single-no-auth" diff --git a/examples/single-server.yaml b/examples/single-server.yaml index d1d8acbf3..b1f881779 100644 --- a/examples/single-server.yaml +++ b/examples/single-server.yaml @@ -1,7 +1,7 @@ -apiVersion: "database.arangodb.com/v1alpha" +apiVersion: "database.arangodb.com/v1" kind: "ArangoDeployment" metadata: name: "example-simple-single" spec: mode: Single - image: arangodb/arangodb:3.6.1 + image: 'arangodb/arangodb:3.7.10' From 09d6a4363fbc94a511195942a9a5e35ab872ae41 Mon Sep 17 00:00:00 2001 From: Edgar Lanting Date: Wed, 14 Apr 2021 13:48:46 +0200 Subject: [PATCH 2/4] Update production-cluster-with-metrics.yaml --- examples/production-cluster-with-metrics.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/production-cluster-with-metrics.yaml b/examples/production-cluster-with-metrics.yaml index 2540caf92..5bda11e4e 100644 --- a/examples/production-cluster-with-metrics.yaml +++ b/examples/production-cluster-with-metrics.yaml @@ -9,9 +9,9 @@ spec: image: 'arangodb/arangodb-exporter:0.1.7' tls: false annotations: - prometheus.io/scrape: 'true' - prometheus.io/port: '9101' - prometheus.io/scrape_interval: '5s' + prometheus.io/scrape: 'true' + prometheus.io/port: '9101' + prometheus.io/scrape_interval: '5s' mode: Cluster image: arangodb/arangodb:3.7.10' environment: Production From d1ac617418658e46f3b0d387e36fbfac4d20f966 Mon Sep 17 00:00:00 2001 From: Edgar Lanting Date: Wed, 14 Apr 2021 13:50:04 +0200 Subject: [PATCH 3/4] Resolved indentation for the `annotations` --- examples/simple-cluster-with-metrics.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/simple-cluster-with-metrics.yaml b/examples/simple-cluster-with-metrics.yaml index 6414116dc..742b0a73e 100644 --- a/examples/simple-cluster-with-metrics.yaml +++ b/examples/simple-cluster-with-metrics.yaml @@ -9,8 +9,8 @@ spec: image: 'arangodb/arangodb-exporter:0.1.7' tls: false annotations: - prometheus.io/scrape: 'true' - prometheus.io/port: '9101' - prometheus.io/scrape_interval: '5s' + prometheus.io/scrape: 'true' + prometheus.io/port: '9101' + prometheus.io/scrape_interval: '5s' mode: Cluster image: 'arangodb/arangodb:3.7.10' From 7caa68c42b820a1a395f881d0d5f74b5a24ff49e Mon Sep 17 00:00:00 2001 From: Edgar Lanting Date: Wed, 14 Apr 2021 16:28:14 +0200 Subject: [PATCH 4/4] Update reboot-pod.yaml - fix typo --- examples/reboot-pod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/reboot-pod.yaml b/examples/reboot-pod.yaml index 7794d6ec9..c446ffb83 100644 --- a/examples/reboot-pod.yaml +++ b/examples/reboot-pod.yaml @@ -6,7 +6,7 @@ spec: restartPolicy: Never serviceAccountName: arango-deployment-operator-reboot containers: - - image: 'arangodb/kube-arangodb:1.1.5' + - image: 'arangodb/kube-arangodb:1.1.7' name: reboot command: ["arangodb_operator", "reboot"] args: