Update examples and better document how to run a multi-region FDB clu…

…ster
FoundationDB · Mar 21, 2023 · d409b96 · d409b96
1 parent 8fd3885
commit d409b96
Show file tree

Hide file tree

Showing 22 changed files with 129 additions and 72 deletions.
diff --git a/config/deployment/manager.yaml b/config/deployment/manager.yaml
@@ -64,7 +64,7 @@ spec:
             - name: fdb-binaries
               mountPath: /var/output-files
         - name: foundationdb-kubernetes-init-7-1
-          image: foundationdb/foundationdb-kubernetes-sidecar:7.1.15-1
+          image: foundationdb/foundationdb-kubernetes-sidecar:7.1.27-1
           args:
             - "--copy-library"
             - "7.1"
@@ -75,7 +75,7 @@ spec:
             - "--copy-binary"
             - "fdbrestore"
             - "--output-dir"
-            - "/var/output-files/7.1.15"
+            - "/var/output-files/7.1.27"
             - "--init-mode"
           volumeMounts:
             - name: fdb-binaries

diff --git a/config/samples/backup.yaml b/config/samples/backup.yaml
@@ -53,7 +53,7 @@ spec:
         secret:
           secretName: fdb-kubernetes-operator-secrets
   snapshotPeriodSeconds: 3600
-  version: 6.3.22
+  version: 7.1.26
 ---
 apiVersion: apps.foundationdb.org/v1beta2
 kind: FoundationDBCluster
@@ -123,4 +123,4 @@ spec:
     enableLivenessProbe: true
     enableReadinessProbe: false
   useExplicitListenAddress: true
-  version: 6.3.22
+  version: 7.1.26
diff --git a/config/samples/client.yaml b/config/samples/client.yaml
@@ -33,7 +33,7 @@ spec:
         - name: FDB_CLUSTER_FILE
           value: /var/dynamic-conf/fdb.cluster
         - name: FDB_API_VERSION
-          value: "610"
+          value: "630"
         - name: FDB_NETWORK_OPTION_TRACE_LOG_GROUP
           value: test-cluster-client
         - name: FDB_NETWORK_OPTION_EXTERNAL_CLIENT_DIRECTORY
@@ -58,13 +58,13 @@ spec:
         - --copy-file
         - fdb.cluster
         - --copy-library
-        - "6.2"
-        - --copy-library
         - "6.3"
+        - --copy-library
+        - "7.1"
         - --init-mode
         - --require-not-empty
         - fdb.cluster
-        image: foundationdb/foundationdb-kubernetes-sidecar:6.3.24-1
+        image: foundationdb/foundationdb-kubernetes-sidecar:7.1.26-1
         name: foundationdb-kubernetes-init
         volumeMounts:
         - mountPath: /var/input-files
@@ -149,4 +149,4 @@ spec:
     enableLivenessProbe: true
     enableReadinessProbe: false
   useExplicitListenAddress: true
-  version: 6.3.22
+  version: 7.1.26
diff --git a/config/samples/cluster.yaml b/config/samples/cluster.yaml
@@ -66,4 +66,4 @@ spec:
     enableLivenessProbe: true
     enableReadinessProbe: false
   useExplicitListenAddress: true
-  version: 6.3.22
+  version: 7.1.26
diff --git a/config/samples/deployment.yaml b/config/samples/deployment.yaml
@@ -218,9 +218,9 @@ spec:
         - --copy-binary
         - fdbrestore
         - --output-dir
-        - /var/output-files/7.1.15
+        - /var/output-files/7.1.27
         - --init-mode
-        image: foundationdb/foundationdb-kubernetes-sidecar:7.1.15-1
+        image: foundationdb/foundationdb-kubernetes-sidecar:7.1.27-1
         name: foundationdb-kubernetes-init-7-1
         volumeMounts:
         - mountPath: /var/output-files

diff --git a/config/samples/restore.yaml b/config/samples/restore.yaml
@@ -54,7 +54,7 @@ spec:
         secret:
           secretName: fdb-kubernetes-operator-secrets
   snapshotPeriodSeconds: 3600
-  version: 6.3.22
+  version: 7.1.26
 ---
 apiVersion: apps.foundationdb.org/v1beta2
 kind: FoundationDBCluster
@@ -124,7 +124,7 @@ spec:
     enableLivenessProbe: true
     enableReadinessProbe: false
   useExplicitListenAddress: true
-  version: 6.3.22
+  version: 7.1.26
 ---
 apiVersion: apps.foundationdb.org/v1beta2
 kind: FoundationDBRestore

diff --git a/config/tests/backup/base/backup.yaml b/config/tests/backup/base/backup.yaml
@@ -3,7 +3,7 @@ kind: FoundationDBBackup
 metadata:
   name: test-cluster
 spec:
-  version: 6.3.22
+  version: 7.1.26
   clusterName: test-cluster
   snapshotPeriodSeconds: 3600
   blobStoreConfiguration:

diff --git a/config/tests/base/cluster.yaml b/config/tests/base/cluster.yaml
@@ -3,7 +3,7 @@ kind: FoundationDBCluster
 metadata:
   name: test-cluster
 spec:
-  version: 6.3.22
+  version: 7.1.26
   faultDomain:
     # Use fake fault domains to support running in a single-node Kubernetes
     # cluster.

diff --git a/config/tests/client/client.yaml b/config/tests/client/client.yaml
@@ -17,14 +17,14 @@ spec:
       automountServiceAccountToken: false
       initContainers:
         - name: foundationdb-kubernetes-init
-          image: foundationdb/foundationdb-kubernetes-sidecar:6.3.24-1
+          image: foundationdb/foundationdb-kubernetes-sidecar:7.1.26-1
           args:
             - "--copy-file"
             - "fdb.cluster"
             - "--copy-library"
-            - "6.2"
-            - "--copy-library"
             - "6.3"
+            - "--copy-library"
+            - "7.1"
             - "--init-mode"
             - "--require-not-empty"
             - "fdb.cluster"
@@ -41,7 +41,7 @@ spec:
             - name: FDB_CLUSTER_FILE
               value: /var/dynamic-conf/fdb.cluster
             - name: FDB_API_VERSION
-              value: "610"
+              value: "630"
             - name: FDB_NETWORK_OPTION_TRACE_LOG_GROUP
               value: test-cluster-client
             - name: FDB_NETWORK_OPTION_EXTERNAL_CLIENT_DIRECTORY

diff --git a/config/tests/dns/client.yaml b/config/tests/dns/client.yaml
@@ -17,7 +17,7 @@ spec:
       automountServiceAccountToken: false
       initContainers:
         - name: foundationdb-kubernetes-init-7-1
-          image: foundationdb/foundationdb-kubernetes-sidecar:7.1.25-1
+          image: foundationdb/foundationdb-kubernetes-sidecar:7.1.26-1
           imagePullPolicy: IfNotPresent
           args:
             - "--copy-file"
@@ -40,7 +40,7 @@ spec:
             - name: FDB_CLUSTER_FILE
               value: /var/dynamic-conf/fdb.cluster
             - name: FDB_API_VERSION
-              value: "610"
+              value: "710"
             - name: FDB_NETWORK_OPTION_TRACE_LOG_GROUP
               value: test-cluster-client
             - name: FDB_NETWORK_OPTION_TRACE_ENABLE

diff --git a/config/tests/dns/dns.yaml b/config/tests/dns/dns.yaml
@@ -1,6 +1,3 @@
-- op: add
-  path: "/spec/version"
-  value: 7.1.25
 - op: add
   path: "/spec/routing/useDNSInClusterFile"
   value: true

diff --git a/config/tests/multi_dc/final.yaml b/config/tests/multi_dc/final.yaml
@@ -10,7 +10,7 @@ metadata:
     cluster-group: test-cluster
   name: test-cluster-$dc
 spec:
-  version: 7.1.25
+  version: 7.1.26
   faultDomain:
     key: foundationdb.org/none
   processGroupIDPrefix: $dc

diff --git a/config/tests/multi_dc/stage_1.yaml b/config/tests/multi_dc/stage_1.yaml
@@ -10,7 +10,7 @@ metadata:
     cluster-group: test-cluster
   name: test-cluster-$dc
 spec:
-  version: 7.1.25
+  version: 7.1.26
   faultDomain:
     key: foundationdb.org/none
   processGroupIDPrefix: $dc

diff --git a/config/tests/multi_kc/final.yaml b/config/tests/multi_kc/final.yaml
@@ -10,7 +10,7 @@ metadata:
     cluster-group: test-cluster
   name: test-cluster-$zone
 spec:
-  version: 7.1.25
+  version: 7.1.26
   faultDomain:
     key: foundationdb.org/kubernetes-cluster
     value: $zone

diff --git a/config/tests/multi_kc/stage_1.yaml b/config/tests/multi_kc/stage_1.yaml
@@ -10,7 +10,7 @@ metadata:
     cluster-group: test-cluster
   name: test-cluster-$zone
 spec:
-  version: 7.1.25
+  version: 7.1.26
   faultDomain:
     key: foundationdb.org/kubernetes-cluster
     value: $zone

diff --git a/docs/manual/backup.md b/docs/manual/backup.md
@@ -18,7 +18,7 @@ kind: FoundationDBBackup
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   clusterName: sample-cluster
   blobStoreConfiguration:
     accountName: account@object-store.example:443
@@ -105,7 +105,7 @@ kind: FoundationDBBackup
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   clusterName: sample-cluster
   blobStoreConfiguration:
     accountName: account@object-store.example:443

diff --git a/docs/manual/customization.md b/docs/manual/customization.md
@@ -14,7 +14,7 @@ kind: FoundationDBCluster
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   spec:
     storageServersPerPod: 2
 ```
@@ -31,7 +31,7 @@ kind: FoundationDBCluster
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   processes:
     general:
       volumeClaimTemplate:
@@ -47,7 +47,7 @@ kind: FoundationDBCluster
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   processes:
     general:
       volumeClaimTemplate:
@@ -65,7 +65,7 @@ kind: FoundationDBCluster
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   processes:
     log:
       volumeClaimTemplate:
@@ -87,7 +87,7 @@ kind: FoundationDBCluster
 metadata:
     name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   processes:
     general:
       podTemplate:
@@ -124,7 +124,7 @@ kind: FoundationDBCluster
 metadata:
     name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   mainContainer:
     imageConfigs:
       - baseImage: docker.example/foundationdb
@@ -143,7 +143,7 @@ kind: FoundationDBCluster
 metadata:
     name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   mainContainer:
     imageConfigs:
       - baseImage: docker.example/foundationdb
@@ -160,11 +160,11 @@ kind: FoundationDBCluster
 metadata:
     name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   mainContainer:
     imageConfigs:
       - baseImage: docker.example/foundationdb
-      - version: 6.2.30
+      - version: 7.1.26
         tag: "build-20210711161700"
       - version: 6.3.0
         tag: "build-20210712161700"
@@ -180,7 +180,7 @@ kind: FoundationDBCluster
 metadata:
     name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   mainContainer:
     imageConfigs:
       - baseImage: docker.example/foundationdb
@@ -369,7 +369,7 @@ kind: FoundationDBCluster
 metadata:
     name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   labels:
     # The default match labels are {"fdb-cluster-name": "sample-cluster"}
     matchLabels:
@@ -390,7 +390,7 @@ kind: FoundationDBCluster
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   labels:
     matchLabels:
       my-cluster: sample-cluster
@@ -411,7 +411,7 @@ kind: FoundationDBCluster
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   labels:
     matchLabels:
       this-cluster: sample-cluster
@@ -428,7 +428,7 @@ kind: FoundationDBCluster
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   labels:
     matchLabels:
       this-cluster: sample-cluster
@@ -450,7 +450,7 @@ kind: FoundationDBCluster
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   labels:
     processClassLabels:
       # Default: ["fdb-process-class", "foundationdb.org/fdb-process-class"]
@@ -470,7 +470,7 @@ kind: FoundationDBCluster
 metadata:
     name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   labels:
     processClassLabels:
       - my-class
@@ -485,7 +485,7 @@ kind: FoundationDBCluster
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   labels:
     processClassLabels:
       - this-class
@@ -511,7 +511,7 @@ kind: FoundationDBCluster
 metadata:
   name: sample-cluster
 spec:
-  version: 6.2.30
+  version: 7.1.26
   useUnifiedImage: true
 ```