diff --git a/stable/cockroachdb/Chart.yaml b/stable/cockroachdb/Chart.yaml
index 363a7eeb82..42076ea5be 100755
--- a/stable/cockroachdb/Chart.yaml
+++ b/stable/cockroachdb/Chart.yaml
@@ -1,6 +1,6 @@
 name: cockroachdb
 home: https://www.cockroachlabs.com
-version: 1.2.1
+version: 1.2.2
 appVersion: 2.0.5
 description: CockroachDB is a scalable, survivable, strongly-consistent SQL database.
 icon: https://raw.githubusercontent.com/cockroachdb/cockroach/master/docs/media/cockroach_db.png
diff --git a/stable/cockroachdb/templates/cockroachdb-statefulset.yaml b/stable/cockroachdb/templates/cockroachdb-statefulset.yaml
index e6d2b88a1f..324bc72bf5 100644
--- a/stable/cockroachdb/templates/cockroachdb-statefulset.yaml
+++ b/stable/cockroachdb/templates/cockroachdb-statefulset.yaml
@@ -220,6 +220,10 @@ spec:
                   values:
                   - "{{ .Release.Name }}-{{ .Values.Component }}"
               topologyKey: kubernetes.io/hostname
+      {{- if .Values.NodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.NodeSelector | indent 8 }}
+      {{- end }}
       containers:
       - name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 56 }}"
         image: "{{ .Values.Image }}:{{ .Values.ImageTag }}"
diff --git a/stable/cockroachdb/values.yaml b/stable/cockroachdb/values.yaml
index 18da47168e..2eb6cb929c 100644
--- a/stable/cockroachdb/values.yaml
+++ b/stable/cockroachdb/values.yaml
@@ -38,6 +38,7 @@ Service:
 PodManagementPolicy: Parallel
 UpdateStrategy:
   type: RollingUpdate
+NodeSelector: {}
 Secure:
   Enabled: false
   RequestCertsImage: "cockroachdb/cockroach-k8s-request-cert"