Merge branch 'master' into release/3.3.3

CHANGELOG.md

@@ -41,6 +41,16 @@
   - System: Wrong container is displayed after configuring multiple core containers
   - System: Added DIST container rebalance timer
 
+## 3.2.6 (March 19, 2021)
+- New Features
+  - CORE: Automate debug collection from a DDI install
+
+- What’s fixed?
+  - CORE: Fixed a post-upgrade issue where data replication from DIST to the DNS service was not complete
+  - CORE: Fixed a data restore issue
+  - CORE: OpenSSL/LibSSL have been patched to address CVE-2020-1971
+  - DHCP: Fixed an issue where the Scope’s Option tab showed an incorrect ScopeGroup name
+  - DNS: Fixed an issue where a secondary zone  configured with a TSIG key would not show this key in the AP or UI, instead showing the zone as if no TSIG key was configured
 
 ## 3.2.5 (February 19, 2021)
 - What’s fixed?

helm/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-version: v0.1.0
-appVersion: v2.3.1
+version: v0.2.0
+appVersion: v3.3.2
 description: NS1 DDI
 name: ns1-ddi

helm/examples/basic.yml

@@ -11,30 +11,27 @@
 #     type: local
 # spec:
 #   capacity:
-#     storage: 2Gi
+#     storage: 20Gi
 #   accessModes:
 #     - ReadWriteOnce
 #   hostPath:
 #     path: "/data-pv"
 
-bootstrap: true
-
 data:
   name: data
   replicas: 1
   image:
     name: ns1inc/privatedns_data
-    tag: 2.3.1
+    tag: 3.3.3
     pullPolicy: IfNotPresent
   livenessProbe:
     initialDelaySeconds: 120
     failureThreshold: 3
     periodSeconds: 15
   storage:
     className: ""
-    size: 1Gi
+    size: 20Gi
   popID: default_pop
-  exposeOpsMetrics: false
   startupFlags: {}
   resources: {}
   nodeSelector: {}
@@ -46,7 +43,7 @@ core:
   replicas: 1
   image:
     name: ns1inc/privatedns_core
-    tag: 2.3.1
+    tag: 3.3.3
     pullPolicy: IfNotPresent
   livenessProbe:
     initialDelaySeconds: 30
@@ -68,7 +65,7 @@ core:
 dns:
   image:
     name: ns1inc/privatedns_dns
-    tag: 2.3.1
+    tag: 3.3.3
     pullPolicy: IfNotPresent
   pops:
   - name: dns
@@ -90,7 +87,7 @@ dns:
 dhcp:
   image:
     name: ns1inc/privatedns_dhcp
-    tag: 2.3.1
+    tag: 3.3.3
     pullPolicy: IfNotPresent
   pops:
   - name: dhcp
@@ -115,7 +112,7 @@ xfr:
   replicas: 1
   image:
     name: ns1inc/privatedns_xfr
-    tag: 2.3.1
+    tag: 3.3.3
     pullPolicy: IfNotPresent
   livenessProbe:
     initialDelaySeconds: 30

helm/examples/multi-node.yml

@@ -5,17 +5,16 @@ data:
   replicas: 3
   image:
     name: ns1inc/privatedns_data
-    tag: 2.3.1
+    tag: 3.3.3
     pullPolicy: IfNotPresent
   livenessProbe:
     initialDelaySeconds: 300
     failureThreshold: 3
     periodSeconds: 15
   storage:
     className: do-block-storage # block storage for Digital Ocean
-    size: 5Gi
+    size: 20Gi
   popID: default_pop
-  exposeOpsMetrics: false
   startupFlags: {}
   resources: {}
   # Run the data pods on the main set of nodes.
@@ -36,10 +35,10 @@ data:
 
 core:
   name: core
-  replicas: 3
+  replicas: 2
   image:
     name: ns1inc/privatedns_core
-    tag: 2.3.1
+    tag: 3.3.3
     pullPolicy: IfNotPresent
   livenessProbe:
     initialDelaySeconds: 30
@@ -83,7 +82,7 @@ core:
 dns:
   image:
     name: ns1inc/privatedns_dns
-    tag: 2.3.1
+    tag: 3.3.3
     pullPolicy: IfNotPresent
   pops:
   - name: dns
@@ -131,7 +130,7 @@ dns:
 dist:
   image:
     name: ns1inc/privatedns_dist
-    tag: 2.3.1
+    tag: 3.3.3
     pullPolicy: IfNotPresent
   pops:
   - name: dist
@@ -142,7 +141,7 @@ dist:
       periodSeconds: 15
     storage:
       className: do-block-storage # block storage for Digital Ocean
-      size: 5Gi
+      size: 20Gi
     popID: edge_pop
     coreService: core
     enableOpsMetrics: false
@@ -161,7 +160,7 @@ dist:
 dhcp:
   image:
     name: ns1inc/privatedns_dhcp
-    tag: 2.3.1
+    tag: 3.3.3
     pullPolicy: IfNotPresent
   pops:
   - name: dhcp
@@ -208,10 +207,10 @@ dhcp:
 
 xfr:
   name: xfr
-  replicas: 3
+  replicas: 2
   image:
     name: ns1inc/privatedns_xfr
-    tag: 2.3.1
+    tag: 3.3.3
     pullPolicy: IfNotPresent
   livenessProbe:
     initialDelaySeconds: 30