Merge pull request #165 from malscent/main

Updates for Couchbase Server 7.1.1
couchbase-partners · Jul 7, 2022 · d6e8b74 · d6e8b74
2 parents 9b6a049 + 6bdbbea
commit d6e8b74
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 46 deletions.
diff --git a/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template b/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template
@@ -91,9 +91,10 @@
         "ServerVersion": {
             "Description": "Couchbase Server Version",
             "Type": "String",
-            "Default": "7.1.0",
+            "Default": "7.1.1",
             "AllowedValues": [
-                "7.1.0"
+                "7.1.0",
+                "7.1.1"
             ]
         },
         "CoreInstanceType": {

diff --git a/aws/CouchbaseServer-Graviton/mappings.json b/aws/CouchbaseServer-Graviton/mappings.json
@@ -1,49 +1,49 @@
 {
     "CouchbaseServer": {
         "ap-northeast-1": {
-            "AMI": "ami-01f233326095220f2"
+            "AMI": "ami-02f28dfcec26e97e6"
         },
         "ap-northeast-2": {
-            "AMI": "ami-00cd6a7c9cc70c32d"
+            "AMI": "ami-0c029f901e4b6c6d4"
         },
         "ap-south-1": {
-            "AMI": "ami-013026916d2fa1e82"
+            "AMI": "ami-004248b8911b92664"
         },
         "ap-southeast-1": {
-            "AMI": "ami-07f7bfde77b87bba4"
+            "AMI": "ami-054757461a7e1268e"
         },
         "ap-southeast-2": {
-            "AMI": "ami-0a4f6ee0025d80c25"
+            "AMI": "ami-00e3dfdcb6a405eb4"
         },
         "ca-central-1": {
-            "AMI": "ami-00a530b28d638e740"
+            "AMI": "ami-0ab6c42f8469cd9c1"
         },
         "eu-central-1": {
-            "AMI": "ami-0e4fcc26d119878d6"
+            "AMI": "ami-0f0bee8956b7327d4"
         },
         "eu-west-1": {
-            "AMI": "ami-011511a150a414511"
+            "AMI": "ami-0cf3290beb83815dd"
         },
         "eu-west-2": {
-            "AMI": "ami-0f1190712b8161862"
+            "AMI": "ami-01112ec17ce218711"
         },
         "eu-west-3": {
-            "AMI": "ami-02e058ac7e9f762f5"
+            "AMI": "ami-0cbbf1f7dcaaf3cf0"
         },
         "sa-east-1": {
-            "AMI": "ami-0fc87675255e762c0"
+            "AMI": "ami-00cd9f541abbefa76"
         },
         "us-east-1": {
-            "AMI": "ami-098922e682342cb87"
+            "AMI": "ami-02ec614215c9a9810"
         },
         "us-east-2": {
-            "AMI": "ami-04a75e48146011047"
+            "AMI": "ami-0329bbf3d08d172c7"
         },
         "us-west-1": {
-            "AMI": "ami-051478b7568e3b798"
+            "AMI": "ami-0bce7ffe17d4a2e38"
         },
         "us-west-2": {
-            "AMI": "ami-099cfe40471736a3d"
+            "AMI": "ami-0856f167e0d679f8c"
         }
     }
 }
diff --git a/aws/CouchbaseServer/couchbase-amzn-lnx2.template b/aws/CouchbaseServer/couchbase-amzn-lnx2.template
@@ -91,7 +91,7 @@
         "ServerVersion": {
             "Description": "Couchbase Server Version",
             "Type": "String",
-            "Default": "7.1.0",
+            "Default": "7.1.1",
             "AllowedValues": [
                 "6.6.5",
                 "6.6.4",
@@ -109,7 +109,8 @@
                 "7.0.2",
                 "7.0.3",
                 "7.0.4",
-                "7.1.0"
+                "7.1.0",
+                "7.1.1"
             ]
         },
         "CoreInstanceType": {

diff --git a/aws/CouchbaseServer/mappings.json b/aws/CouchbaseServer/mappings.json
@@ -1,49 +1,49 @@
 {
     "CouchbaseServer": {
         "ap-northeast-1": {
-            "AMI": "ami-015f1f51d48979d8f"
+            "AMI": "ami-011f0b39eba384025"
         },
         "ap-northeast-2": {
-            "AMI": "ami-0a67b9f14a5ee769b"
+            "AMI": "ami-03370cfaf2c2d4cab"
         },
         "ap-south-1": {
-            "AMI": "ami-075d09a45dca0c96e"
+            "AMI": "ami-0a1e547f7b70d3137"
         },
         "ap-southeast-1": {
-            "AMI": "ami-00f27d5981a71e9ac"
+            "AMI": "ami-0aa10737cf1945673"
         },
         "ap-southeast-2": {
-            "AMI": "ami-03ff6ddafe0c36871"
+            "AMI": "ami-012796fa6d230d5d9"
         },
         "ca-central-1": {
-            "AMI": "ami-053cc148dba7423b3"
+            "AMI": "ami-01b491671e0515459"
         },
         "eu-central-1": {
-            "AMI": "ami-043cbdccf8b61217f"
+            "AMI": "ami-05ca2157b155ad790"
         },
         "eu-west-1": {
-            "AMI": "ami-0a6f7e8e66c8b8f41"
+            "AMI": "ami-07f25caef3b115277"
         },
         "eu-west-2": {
-            "AMI": "ami-0ad64e44b447e138a"
+            "AMI": "ami-02e5277b49c00062b"
         },
         "eu-west-3": {
-            "AMI": "ami-077d0a635189cdabb"
+            "AMI": "ami-03c96d1e97352da88"
         },
         "sa-east-1": {
-            "AMI": "ami-05de2c5f79c253d16"
+            "AMI": "ami-0557fea1bfcfd5406"
         },
         "us-east-1": {
-            "AMI": "ami-0387f439817029bf4"
+            "AMI": "ami-0029dad066d20afaa"
         },
         "us-east-2": {
-            "AMI": "ami-0074f7f878b40424a"
+            "AMI": "ami-05d74dfdf759c88fe"
         },
         "us-west-1": {
-            "AMI": "ami-0a6c067f62946b52e"
+            "AMI": "ami-0ad6562fe438b2f57"
         },
         "us-west-2": {
-            "AMI": "ami-0ea54051dfef81c7a"
+            "AMI": "ami-0cc18ca23a04165be"
         }
     }
 }
diff --git a/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template b/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template
@@ -39,8 +39,9 @@
         "ServerVersion": {
             "Description": "Couchbase Server Version",
             "Type": "String",
-            "Default": "7.1.0",
+            "Default": "7.1.1",
             "AllowedValues": [
+                "7.1.1",
                 "7.1.0",
                 "7.0.4",
                 "7.0.3",

diff --git a/azure/CouchbaseServer-Application/createUiDefinition.json b/azure/CouchbaseServer-Application/createUiDefinition.json
@@ -367,11 +367,15 @@
             "type": "Microsoft.Common.DropDown",
             "label": "Server Version",
             "toolTip": "What version of Couchbase Server is to be installed",
-            "defaultValue": "7.1.0 (recommended)",
+            "defaultValue": "7.1.1 (recommended)",
             "constraints": {
               "allowedValues": [
                 {
-                  "label": "7.1.0 (recommended)",
+                  "label": "7.1.1 (recommended)",
+                  "value": "7.1.1"
+                },
+                {
+                  "label": "7.1.0",
                   "value": "7.1.0"
                 },
                 {

diff --git a/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json b/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json
@@ -316,12 +316,16 @@
             "name": "serverVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Server Version",
-            "defaultValue": "7.1.0 (recommended)",
+            "defaultValue": "7.1.1 (recommended)",
             "toolTip": "Server Version",
             "constraints": {
               "allowedValues": [
                 {
-                  "label": "7.1.0 (recommended)",
+                  "label": "7.1.1 (recommended)",
+                  "value": "7.1.1"
+                },
+                {
+                  "label": "7.1.0",
                   "value": "7.1.0"
                 },
                 {

diff --git a/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema b/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema
@@ -111,8 +111,10 @@ properties:
     default: 20
   serverVersion:
     type: string
-    default: 7.0.3
+    default: 7.1.1
     enum:
+      - 7.1.1
+      - 7.1.0
       - 7.0.4
       - 7.0.3
       - 7.0.2

diff --git a/gcp/couchbase-enterprise-edition-byol/test_config.yaml b/gcp/couchbase-enterprise-edition-byol/test_config.yaml
@@ -5,4 +5,4 @@ resources:
 - name: couchbase
   type: couchbase.py
   properties: 
-    serverVersion: 7.0.3
+    serverVersion: 7.1.1
diff --git a/gcp/couchbase-server/couchbase.py.schema b/gcp/couchbase-server/couchbase.py.schema
@@ -67,8 +67,9 @@ properties:
     default: 20
   serverVersion:
     type: string
-    default: 7.1.0
+    default: 7.1.1
     enum:
+      - 7.1.1
       - 7.1.0
       - 7.0.4
       - 7.0.3

diff --git a/gcp/couchbase-server/resources/instance_template.py.schema b/gcp/couchbase-server/resources/instance_template.py.schema
@@ -9,8 +9,9 @@ properties:
     default: default
   serverVersion:
     type: string
-    default: 7.1.0
+    default: 7.1.1
     enum:
+      - 7.1.1
       - 7.1.0
       - 7.0.4
       - 7.0.3

diff --git a/gcp/couchbase-server/test_config.local.yaml b/gcp/couchbase-server/test_config.local.yaml
@@ -10,7 +10,7 @@ resources:
       serverNodeCount: 3
       serverNodeType: n1-standard-4
       serverDiskSize: 20
-      serverVersion: 7.0.3
+      serverVersion: 7.1.1
       username: couchbase
       password: foo123!
       accessCIDR: 0.0.0.0/0

diff --git a/gcp/couchbase-server/test_config.yaml b/gcp/couchbase-server/test_config.yaml
@@ -10,7 +10,7 @@ resources:
       serverNodeCount: 3
       serverNodeType: n1-standard-4
       serverDiskSize: 20
-      serverVersion: 7.0.3
+      serverVersion: 7.1.1
       username: couchbase
       password: foo123!
       accessCIDR: 0.0.0.0/0

diff --git a/gcp/shared/group.py.schema b/gcp/shared/group.py.schema
@@ -22,8 +22,11 @@ properties:
     description: Type of Couchbase license to be supported by the deployment.
   serverVersion:
     type: string
-    default: 7.0.0
+    default: 7.1.1
     enum:
+      - 7.1.1
+      - 7.1.0
+      - 7.0.4
       - 7.0.0
       - 6.6.3
       - 6.6.2