From b97adae0bac3c834791bfef1217768e5bc26cf35 Mon Sep 17 00:00:00 2001 From: Justin Ashworth Date: Mon, 18 Mar 2024 17:06:16 -0600 Subject: [PATCH 1/4] Fixes for 7.6.0 --- .gitignore | 3 +- .../couchbase-amzn-lnx2.template | 5 +- aws/CouchbaseServer/mappings.json | 30 ++++----- aws/couchbase-ami-creation/rpm_exploder.sh | 14 +++-- .../Couchbase-VirtualMachine/deb_exploder.sh | 63 +++++++++++++++++-- .../createUiDefinition.Unlicensed.json | 20 +++++- .../createUiDefinition.json | 20 +++++- .../test/mds_parameters.json | 2 +- .../test/parameters.json | 2 +- .../test/test_parameters/bad_mds_params.json | 2 +- .../test_parameters/mds_with_ssh_key.json | 2 +- .../test/verifier_tests/Defaults.json | 2 +- .../test/verifier_tests/bad_mds_tests.json | 2 +- .../test/verifier_tests/mds_tests.json | 2 +- gcp/couchbase-server/couchbase.py.schema | 14 ++--- .../resources/instance_template.py.schema | 14 ++--- gcp/couchbase-vm-generation/deb_exploder.sh | 60 ++++++++++++++++-- 17 files changed, 199 insertions(+), 58 deletions(-) diff --git a/.gitignore b/.gitignore index 6563448..32f66e9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /tmp .DS_Store .DS_Store/ -.vscode/ \ No newline at end of file +.vscode/ +/dist \ No newline at end of file diff --git a/aws/CouchbaseServer/couchbase-amzn-lnx2.template b/aws/CouchbaseServer/couchbase-amzn-lnx2.template index 4f94e66..ee5f166 100644 --- 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.2.4", + "Default": "7.6.0", "AllowedValues": [ "6.6.6", "6.6.5", @@ -121,7 +121,8 @@ "7.2.0", "7.2.2", "7.2.3", - "7.2.4" + "7.2.4", + "7.6.0" ] }, "CoreInstanceType": { diff --git a/aws/CouchbaseServer/mappings.json b/aws/CouchbaseServer/mappings.json index e14c565..37286d8 100644 --- a/aws/CouchbaseServer/mappings.json +++ b/aws/CouchbaseServer/mappings.json @@ -1,49 +1,49 @@ { "CouchbaseServer": { "ap-northeast-1": { - "AMI": "ami-0b4904d83635a5f14" + "AMI": "ami-0cc17d10d2b14ae7e" }, "ap-northeast-2": { - "AMI": "ami-0b709ff84b70d962f" + "AMI": "ami-0aa46773288e74d66" }, "ap-south-1": { - "AMI": "ami-08385fe6d2b01a65e" + "AMI": "ami-08190105e514941ac" }, "ap-southeast-1": { - "AMI": "ami-0b31babc177cfc192" + "AMI": "ami-022f147fcda499501" }, "ap-southeast-2": { - "AMI": "ami-0f02d93dbe6b998e9" + "AMI": "ami-0146d0ef781e99845" }, "ca-central-1": { - "AMI": "ami-024926fac7c2a7cbe" + "AMI": "ami-0475939887a31e4ee" }, "eu-central-1": { - "AMI": "ami-083d1823795f8730f" + "AMI": "ami-0cf4e6377ad164de5" }, "eu-west-1": { - "AMI": "ami-041ae9c14df7edc0f" + "AMI": "ami-01fadffb1ee45429b" }, "eu-west-2": { - "AMI": "ami-01792a145f38889e8" + "AMI": "ami-0d69fa456089fc677" }, "eu-west-3": { - "AMI": "ami-0df0ed7517b80555d" + "AMI": "ami-0c43ac7f6546fa97d" }, "sa-east-1": { - "AMI": "ami-0a803ed101701e6b2" + "AMI": "ami-0c194b4d817eade7a" }, "us-east-1": { - "AMI": "ami-01648bf3c94e32067" + "AMI": "ami-0afb013e297940095" }, "us-east-2": { - "AMI": "ami-0de7bd56ac48e6da1" + "AMI": "ami-0936a9ca51470a14e" }, "us-west-1": { - "AMI": "ami-02e376f6709e54ddb" + "AMI": "ami-0975a9763d26eea94" }, "us-west-2": { - "AMI": "ami-0fa1fbce64155fdf7" + "AMI": "ami-04e56e2a935ebd3ca" } } } diff --git a/aws/couchbase-ami-creation/rpm_exploder.sh b/aws/couchbase-ami-creation/rpm_exploder.sh index 51e9a13..1eab403 100644 --- a/aws/couchbase-ami-creation/rpm_exploder.sh +++ b/aws/couchbase-ami-creation/rpm_exploder.sh @@ -126,16 +126,22 @@ else echo "#!/usr/bin/env sh export COUCHBASE_SERVER_VERSION=$VERSION" > /etc/profile.d/couchbaseserver.sh DOWNLOAD_URL="https://packages.couchbase.com/releases/$VERSION/couchbase-server-enterprise-$VERSION-amzn2.${ARCHITECTURE}.rpm" + FILE_NAME="couchbase-server-enterprise-$VERSION-amzn2.${ARCHITECTURE}.rpm" greaterThan722=$(__compareVersions "7.2.2" "$VERSION") if [[ "$greaterThan722" -le "0" ]]; then DOWNLOAD_URL="https://packages.couchbase.com/releases/${VERSION}/couchbase-server-enterprise-${VERSION}-linux.${ARCHITECTURE}.rpm" + FILE_NAME="couchbase-server-enterprise-${VERSION}-linux.${ARCHITECTURE}.rpm" fi - if [[ ! -f "/home/ec2-user/couchbase-server-enterprise-${VERSION}-amzn2.${ARCHITECTURE}.rpm" ]]; then - wget -O "/setup/couchbase-server-enterprise-$VERSION-amzn2.${ARCHITECTURE}.rpm" "$DOWNLOAD_URL" --quiet + echo "File Name: $FILE_NAME" + echo $(test -f "/home/ec2-user/$FILE_NAME") + echo $(ls -l /home/ec2-user) + + if [[ ! -f "/home/ec2-user/$FILE_NAME" ]]; then + wget -O "/setup/$FILE_NAME" "$DOWNLOAD_URL" --quiet else - cp "/home/ec2-user/couchbase-server-enterprise-${VERSION}-amzn2.${ARCHITECTURE}.rpm" "/setup/couchbase-server-enterprise-${VERSION}-amzn2.${ARCHITECTURE}.rpm" + cp "/home/ec2-user/$FILE_NAME" "/setup/$FILE_NAME" fi - RPM="/setup/couchbase-server-enterprise-$VERSION-amzn2.${ARCHITECTURE}.rpm" + RPM="/setup/$FILE_NAME" fi echo "Installing prerequisites" diff --git a/azure/Couchbase-VirtualMachine/deb_exploder.sh b/azure/Couchbase-VirtualMachine/deb_exploder.sh index ec5726e..946d5c0 100644 --- a/azure/Couchbase-VirtualMachine/deb_exploder.sh +++ b/azure/Couchbase-VirtualMachine/deb_exploder.sh @@ -1,6 +1,45 @@ #!/usr/bin/env bash set -eou pipefail + +function __compareVersions() { + if [[ $1 == "$2" ]] + then + echo 0 + return + fi + local IFS=. + + local i ver1 ver2 + read -r -a ver1 <<< "$1" + read -r -a ver2 <<< "$2" + # fill empty fields in ver1 with zeros + for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) + do + ver1[i]=0 + done + for ((i=0; i<${#ver1[@]}; i++)) + do + if [[ -z ${ver2[i]} ]] + then + # fill empty fields in ver2 with zeros + ver2[i]=0 + fi + if ((10#${ver1[i]} > 10#${ver2[i]})) + then + echo 1 + return + fi + if ((10#${ver1[i]} < 10#${ver2[i]})) + then + echo -1 + return + fi + done + echo 0 + return +} + until apt-get update > /dev/null; do echo "Error performing package repository update" sleep 1 @@ -96,15 +135,29 @@ _EOF DEB="/setup/couchbase-sync-gateway-enterprise_${VERSION}_x86_64.deb" else echo "Preinstalling Server" + ARCH=$(uname -m) + OS_VERSION="20.04" + if [[ "$ARCH" == "aarch64" ]]; then + ARCH=arm64 + fi + if [[ "$ARCH" == "x86_64" ]]; then + ARCH=amd64 + fi + download_url="http://packages.couchbase.com/releases/${VERSION}/couchbase-server-enterprise_${VERSION}-ubuntu${OS_VERSION}_${ARCH}.deb" + file_path="/setup/couchbase-server-enterprise_${VERSION}-ubuntu${OS_VERSION}_${ARCH}.deb" echo "#!/usr/bin/env sh export COUCHBASE_SERVER_VERSION=$VERSION" > /etc/profile.d/couchbaseserver.sh - if [[ ! -f "./couchbase-server-enterprise-${VERSION}-ubuntu20.04_amd64.deb" ]]; then - wget -O "/setup/couchbase-server-enterprise-$VERSION-ubuntu20.04_amd64.deb" \ - "http://packages.couchbase.com/releases/${VERSION}/couchbase-server-enterprise_${VERSION}-ubuntu20.04_amd64.deb" + greaterThan722=$(__compareVersions "7.2.2" "$VERSION") + if [[ "$greaterThan722" -le "0" ]]; then + download_url="https://packages.couchbase.com/releases/${VERSION}/couchbase-server-enterprise_${VERSION}-linux_${ARCH}.deb" + file_path="/setup/couchbase-server-enterprise-${VERSION}-linux_${ARCH}.deb" + fi + if [[ ! -f "./couchbase-server-enterprise_${VERSION}-ubuntu20.04_amd64.deb" ]]; then + wget -O "$file_path" "$download_url" else - cp "./couchbase-server-enterprise-${VERSION}-ubuntu20.04_amd64.deb" "/setup/couchbase-server-enterprise-${VERSION}-ubuntu20.04_amd64.deb" + cp "./couchbase-server-enterprise_${VERSION}-ubuntu20.04_amd64.deb" "$file_path" fi - DEB="/setup/couchbase-server-enterprise-$VERSION-ubuntu20.04_amd64.deb" + DEB="$file_path" fi mkdir -p /setup/couchbase diff --git a/azure/CouchbaseServer-Application/createUiDefinition.Unlicensed.json b/azure/CouchbaseServer-Application/createUiDefinition.Unlicensed.json index da1a313..42489ab 100644 --- a/azure/CouchbaseServer-Application/createUiDefinition.Unlicensed.json +++ b/azure/CouchbaseServer-Application/createUiDefinition.Unlicensed.json @@ -386,11 +386,27 @@ "type": "Microsoft.Common.DropDown", "label": "Server Version", "toolTip": "What version of Couchbase Server is to be installed", - "defaultValue": "7.2.0 (recommended)", + "defaultValue": "7.6.0 (recommended)", "constraints": { "allowedValues": [ { - "label": "7.2.0 (recommended)", + "label": "7.6.0 (recommended)", + "value": "7.6.0" + }, + { + "label": "7.2.4", + "value": "7.2.4" + }, + { + "label": "7.2.3", + "value": "7.2.3" + }, + { + "label": "7.2.2", + "value": "7.2.2" + }, + { + "label": "7.2.0", "value": "7.2.0" }, { diff --git a/azure/CouchbaseServer-Application/createUiDefinition.json b/azure/CouchbaseServer-Application/createUiDefinition.json index e596da0..c266d5a 100644 --- a/azure/CouchbaseServer-Application/createUiDefinition.json +++ b/azure/CouchbaseServer-Application/createUiDefinition.json @@ -367,11 +367,27 @@ "type": "Microsoft.Common.DropDown", "label": "Server Version", "toolTip": "What version of Couchbase Server is to be installed", - "defaultValue": "7.2.0 (recommended)", + "defaultValue": "7.6.0 (recommended)", "constraints": { "allowedValues": [ { - "label": "7.2.0 (recommended)", + "label": "7.6.0 (recommended)", + "value": "7.6.0" + }, + { + "label": "7.2.4", + "value": "7.2.4" + }, + { + "label": "7.2.3", + "value": "7.2.3" + }, + { + "label": "7.2.2", + "value": "7.2.2" + }, + { + "label": "7.2.0", "value": "7.2.0" }, { diff --git a/azure/CouchbaseServer-Application/test/mds_parameters.json b/azure/CouchbaseServer-Application/test/mds_parameters.json index 206d9e1..a0c0c3e 100644 --- a/azure/CouchbaseServer-Application/test/mds_parameters.json +++ b/azure/CouchbaseServer-Application/test/mds_parameters.json @@ -18,7 +18,7 @@ "value": 32 }, "serverVersion": { - "value": "7.2.0" + "value": "7.6.0" }, "vmSize": { "value": "Standard_DS12_v2" diff --git a/azure/CouchbaseServer-Application/test/parameters.json b/azure/CouchbaseServer-Application/test/parameters.json index f022de3..098f385 100644 --- a/azure/CouchbaseServer-Application/test/parameters.json +++ b/azure/CouchbaseServer-Application/test/parameters.json @@ -21,7 +21,7 @@ "value": 32 }, "serverVersion": { - "value": "7.2.0" + "value": "7.6.0" }, "vmSize": { "value": "Standard_DS12_v2" diff --git a/azure/CouchbaseServer-Application/test/test_parameters/bad_mds_params.json b/azure/CouchbaseServer-Application/test/test_parameters/bad_mds_params.json index 19f31d5..d4a0e36 100644 --- a/azure/CouchbaseServer-Application/test/test_parameters/bad_mds_params.json +++ b/azure/CouchbaseServer-Application/test/test_parameters/bad_mds_params.json @@ -18,7 +18,7 @@ "value": 32 }, "serverVersion": { - "value": "7.2.0" + "value": "7.6.0" }, "vmSize": { "value": "Standard_DS12_v2" diff --git a/azure/CouchbaseServer-Application/test/test_parameters/mds_with_ssh_key.json b/azure/CouchbaseServer-Application/test/test_parameters/mds_with_ssh_key.json index 78b85c7..8f8da06 100644 --- a/azure/CouchbaseServer-Application/test/test_parameters/mds_with_ssh_key.json +++ b/azure/CouchbaseServer-Application/test/test_parameters/mds_with_ssh_key.json @@ -18,7 +18,7 @@ "value": 32 }, "serverVersion": { - "value": "7.0.3" + "value": "7.6.0" }, "vmSize": { "value": "Standard_DS12_v2" diff --git a/azure/CouchbaseServer-Application/test/verifier_tests/Defaults.json b/azure/CouchbaseServer-Application/test/verifier_tests/Defaults.json index fb1b43f..4c9b149 100644 --- a/azure/CouchbaseServer-Application/test/verifier_tests/Defaults.json +++ b/azure/CouchbaseServer-Application/test/verifier_tests/Defaults.json @@ -46,7 +46,7 @@ }, { "Name": "VersionValidator", - "ExpectedResult": "7.2.0" + "ExpectedResult": "7.6.0" } ] } \ No newline at end of file diff --git a/azure/CouchbaseServer-Application/test/verifier_tests/bad_mds_tests.json b/azure/CouchbaseServer-Application/test/verifier_tests/bad_mds_tests.json index def53d8..51c93c4 100644 --- a/azure/CouchbaseServer-Application/test/verifier_tests/bad_mds_tests.json +++ b/azure/CouchbaseServer-Application/test/verifier_tests/bad_mds_tests.json @@ -46,7 +46,7 @@ }, { "Name": "VersionValidator", - "ExpectedResult": "7.2.0" + "ExpectedResult": "7.6.0" } ] } \ No newline at end of file diff --git a/azure/CouchbaseServer-Application/test/verifier_tests/mds_tests.json b/azure/CouchbaseServer-Application/test/verifier_tests/mds_tests.json index 3ff3566..778b8f6 100644 --- a/azure/CouchbaseServer-Application/test/verifier_tests/mds_tests.json +++ b/azure/CouchbaseServer-Application/test/verifier_tests/mds_tests.json @@ -46,7 +46,7 @@ }, { "Name": "VersionValidator", - "ExpectedResult": "7.2.0" + "ExpectedResult": "7.6.0" } ] } \ No newline at end of file diff --git a/gcp/couchbase-server/couchbase.py.schema b/gcp/couchbase-server/couchbase.py.schema index 5115578..0721aa6 100755 --- a/gcp/couchbase-server/couchbase.py.schema +++ b/gcp/couchbase-server/couchbase.py.schema @@ -67,8 +67,13 @@ properties: default: 20 serverVersion: type: string - default: 7.2.0 + default: 7.6.0 enum: + - 7.6.0 + - 7.2.4 + - 7.2.3 + - 7.2.2 + - 7.2.1 - 7.2.0 - 7.1.4 - 7.1.3 @@ -79,13 +84,6 @@ properties: - 7.0.4 - 7.0.3 - 7.0.2 - - 6.6.6 - - 6.6.5 - - 6.6.4 - - 6.6.3 - - 6.6.2 - - 6.6.1 - - 6.6.0 username: type: string password: diff --git a/gcp/couchbase-server/resources/instance_template.py.schema b/gcp/couchbase-server/resources/instance_template.py.schema index b02c030..bf596c9 100644 --- a/gcp/couchbase-server/resources/instance_template.py.schema +++ b/gcp/couchbase-server/resources/instance_template.py.schema @@ -9,8 +9,13 @@ properties: default: default serverVersion: type: string - default: 7.2.0 + default: 7.6.0 enum: + - 7.6.0 + - 7.2.4 + - 7.2.3 + - 7.2.2 + - 7.2.1 - 7.2.0 - 7.1.4 - 7.1.3 @@ -21,13 +26,6 @@ properties: - 7.0.4 - 7.0.3 - 7.0.2 - - 6.6.6 - - 6.6.5 - - 6.6.4 - - 6.6.3 - - 6.6.2 - - 6.6.1 - - 6.6.0 serverDiskSize: type: integer default: 500 diff --git a/gcp/couchbase-vm-generation/deb_exploder.sh b/gcp/couchbase-vm-generation/deb_exploder.sh index fda2799..b8a364f 100644 --- a/gcp/couchbase-vm-generation/deb_exploder.sh +++ b/gcp/couchbase-vm-generation/deb_exploder.sh @@ -1,6 +1,44 @@ #!/usr/bin/env bash set -eou pipefail +function __compareVersions() { + if [[ $1 == "$2" ]] + then + echo 0 + return + fi + local IFS=. + + local i ver1 ver2 + read -r -a ver1 <<< "$1" + read -r -a ver2 <<< "$2" + # fill empty fields in ver1 with zeros + for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)) + do + ver1[i]=0 + done + for ((i=0; i<${#ver1[@]}; i++)) + do + if [[ -z ${ver2[i]} ]] + then + # fill empty fields in ver2 with zeros + ver2[i]=0 + fi + if ((10#${ver1[i]} > 10#${ver2[i]})) + then + echo 1 + return + fi + if ((10#${ver1[i]} < 10#${ver2[i]})) + then + echo -1 + return + fi + done + echo 0 + return +} + until apt-get update > /dev/null; do echo "Error performing package repository update" sleep 1 @@ -110,15 +148,29 @@ _EOF DEB="/setup/couchbase-sync-gateway-enterprise_${VERSION}_x86_64.deb" else echo "Preinstalling Server" + ARCH=$(uname -m) + OS_VERSION="20.04" + if [[ "$ARCH" == "aarch64" ]]; then + ARCH=arm64 + fi + if [[ "$ARCH" == "x86_64" ]]; then + ARCH=amd64 + fi + download_url="http://packages.couchbase.com/releases/${VERSION}/couchbase-server-enterprise_${VERSION}-ubuntu${OS_VERSION}_${ARCH}.deb" + file_path="/setup/couchbase-server-enterprise_${VERSION}-ubuntu${OS_VERSION}_${ARCH}.deb" echo "#!/usr/bin/env sh export COUCHBASE_SERVER_VERSION=$VERSION" > /etc/profile.d/couchbaseserver.sh + greaterThan722=$(__compareVersions "7.2.2" "$VERSION") + if [[ "$greaterThan722" -le "0" ]]; then + download_url="https://packages.couchbase.com/releases/${VERSION}/couchbase-server-enterprise_${VERSION}-linux_${ARCH}.deb" + file_path="/setup/couchbase-server-enterprise-${VERSION}-linux_${ARCH}.deb" + fi if [[ ! -f "./couchbase-server-enterprise_${VERSION}-ubuntu20.04_amd64.deb" ]]; then - wget -O "/setup/couchbase-server-enterprise_$VERSION-ubuntu20.04_amd64.deb" \ - "http://packages.couchbase.com/releases/${VERSION}/couchbase-server-enterprise_${VERSION}-ubuntu20.04_amd64.deb" + wget -O "$file_path" "$download_url" else - cp "./couchbase-server-enterprise_${VERSION}-ubuntu20.04_amd64.deb" "/setup/couchbase-server-enterprise_${VERSION}-ubuntu20.04_amd64.deb" + cp "./couchbase-server-enterprise_${VERSION}-ubuntu20.04_amd64.deb" "$file_path" fi - DEB="/setup/couchbase-server-enterprise_$VERSION-ubuntu20.04_amd64.deb" + DEB="$file_path" fi mkdir -p /setup/couchbase From 5d3bc494d6887292ffc1feba82d5315bed0ad2b0 Mon Sep 17 00:00:00 2001 From: Justin Ashworth Date: Mon, 18 Mar 2024 17:15:22 -0600 Subject: [PATCH 2/4] fixes for template --- azure/CouchbaseServer-Application/mainTemplate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/CouchbaseServer-Application/mainTemplate.json b/azure/CouchbaseServer-Application/mainTemplate.json index 9e00777..90b2a80 100644 --- a/azure/CouchbaseServer-Application/mainTemplate.json +++ b/azure/CouchbaseServer-Application/mainTemplate.json @@ -261,7 +261,7 @@ }, "resources": [ { - "apiVersion": "2021-12-01", + "apiVersion": "2022-07-01", "type": "Microsoft.Network/networkSecurityGroups", "name": "[couchbase.generateResourceName('networkSecurityGroups', parameters('_now'))]", "location": "[parameters('location')]", @@ -414,7 +414,7 @@ "name": "[parameters('vnet').name]", "type": "Microsoft.Network/virtualNetworks", "condition": "[equals(parameters('newOrExisting'), 'new')]", - "apiVersion": "2021-12-01", + "apiVersion": "2022-07-01", "location": "[parameters('location')]", "dependsOn": [ "[resourceId('Microsoft.Network/networkSecurityGroups/', couchbase.generateResourceName('networkSecurityGroups', parameters('_now')))]" From 40f973e586124d35ffd9dd1ee0c5db27190f7ba5 Mon Sep 17 00:00:00 2001 From: Justin Ashworth Date: Mon, 18 Mar 2024 17:21:02 -0600 Subject: [PATCH 3/4] updates for gateway template --- .../CouchbaseSyncGateway-Application/mainTemplate.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure/CouchbaseSyncGateway-Application/mainTemplate.json b/azure/CouchbaseSyncGateway-Application/mainTemplate.json index 4542bf5..99caa6b 100644 --- a/azure/CouchbaseSyncGateway-Application/mainTemplate.json +++ b/azure/CouchbaseSyncGateway-Application/mainTemplate.json @@ -155,7 +155,7 @@ }, "resources": [ { - "apiVersion": "2021-12-01", + "apiVersion": "2022-07-01", "type": "Microsoft.Network/networkSecurityGroups", "name": "[couchbase.generateResourceName('networkSecurityGroups', parameters('_now'))]", "location": "[parameters('location')]", @@ -210,7 +210,7 @@ "name": "[parameters('vnet').name]", "type": "Microsoft.Network/virtualNetworks", "condition": "[equals(parameters('newOrExisting'), 'new')]", - "apiVersion": "2021-12-01", + "apiVersion": "2022-07-01", "location": "[parameters('location')]", "dependsOn": [ "[resourceId('Microsoft.Network/networkSecurityGroups/', couchbase.generateResourceName('networkSecurityGroups', parameters('_now')))]" @@ -235,7 +235,7 @@ { "type": "Microsoft.Network/publicIPAddresses", "name": "[couchbase.generateResourceName('sg-lb-ip', parameters('_now'))]", - "apiVersion": "2022-01-01", + "apiVersion": "2022-07-01", "location": "[parameters('location')]", "sku": { "name": "Standard" @@ -248,7 +248,7 @@ { "type": "Microsoft.Network/publicIPAddresses", "name": "[couchbase.generateResourceName('sg-lb-ip-outbound', parameters('_now'))]", - "apiVersion": "2022-01-01", + "apiVersion": "2022-07-01", "location": "[parameters('location')]", "sku": { "name": "Standard" @@ -261,7 +261,7 @@ { "type": "Microsoft.Network/loadBalancers", "name": "[couchbase.generateResourceName('sg-lb', parameters('_now'))]", - "apiVersion": "2022-01-01", + "apiVersion": "2022-07-01", "location": "[parameters('location')]", "sku": { "name": "Standard" From d9d252414ef72c72571079460b8b8d6a20f4cea0 Mon Sep 17 00:00:00 2001 From: Justin Ashworth Date: Mon, 18 Mar 2024 17:27:29 -0600 Subject: [PATCH 4/4] updated out of date api versions --- .../mainTemplate.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/azure/CouchbaseServerAndSyncGateway-Application/mainTemplate.json b/azure/CouchbaseServerAndSyncGateway-Application/mainTemplate.json index 6b677ac..4026108 100644 --- a/azure/CouchbaseServerAndSyncGateway-Application/mainTemplate.json +++ b/azure/CouchbaseServerAndSyncGateway-Application/mainTemplate.json @@ -142,7 +142,7 @@ }, "resources": [ { - "apiVersion": "2021-12-01", + "apiVersion": "2022-07-01", "type": "Microsoft.Network/networkSecurityGroups", "name": "[couchbase.generateResourceName('networkSecurityGroups')]", "location": "[parameters('location')]", @@ -309,7 +309,7 @@ "name": "[parameters('vnet').name]", "type": "Microsoft.Network/virtualNetworks", "condition": "[equals(parameters('newOrExisting'), 'new')]", - "apiVersion": "2021-12-01", + "apiVersion": "2022-07-01", "location": "[parameters('location')]", "tags": { "usedBy": "[parameters('location')]" @@ -338,7 +338,7 @@ "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[couchbase.generateResourceName('server')]", "location": "[parameters('location')]", - "apiVersion": "2021-11-01", + "apiVersion": "2022-07-01", "dependsOn": [ "[resourceId('Microsoft.Network/virtualNetworks', parameters('vnet').name)]" ], @@ -457,7 +457,7 @@ "type": "Microsoft.Network/publicIPAddresses", "name": "[couchbase.generateResourceName('sg-lb-ip')]", "condition": "[not(equals(parameters('syncGatewayNodeCount'), 0))]", - "apiVersion": "2022-01-01", + "apiVersion": "2022-07-01", "location": "[parameters('location')]", "sku": { "name": "Standard" @@ -471,7 +471,7 @@ "type": "Microsoft.Network/publicIPAddresses", "name": "[couchbase.generateResourceName('sg-lb-ip-outbound')]", "condition": "[not(equals(parameters('syncGatewayNodeCount'), 0))]", - "apiVersion": "2022-01-01", + "apiVersion": "2022-07-01", "location": "[parameters('location')]", "sku": { "name": "Standard" @@ -485,7 +485,7 @@ "type": "Microsoft.Network/loadBalancers", "name": "[couchbase.generateResourceName('sg-lb')]", "condition": "[not(equals(parameters('syncGatewayNodeCount'), 0))]", - "apiVersion": "2022-01-01", + "apiVersion": "2022-07-01", "location": "[parameters('location')]", "sku": { "name": "Standard" @@ -699,7 +699,7 @@ "name": "[couchbase.generateResourceName('syncgateway')]", "condition": "[not(equals(parameters('syncGatewayNodeCount'), 0))]", "location": "[parameters('location')]", - "apiVersion": "2021-11-01", + "apiVersion": "2022-07-01", "dependsOn": [ "[resourceId('Microsoft.Network/virtualNetworks', parameters('vnet').name)]", "[resourceId('Microsoft.Network/loadBalancers', couchbase.generateResourceName('sg-lb'))]"