Merge branch 'master' into manageduser-db

Azure · May 1, 2020 · 378ce10 · 378ce10
2 parents dd7ef2c + 962671a
commit 378ce10
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
@@ -6,19 +6,18 @@ metadata:
   name: controller-manager
   namespace: system
 spec:
-  template:
-    spec:
-      containers:
-      - name: kube-rbac-proxy
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
-        args:
-        - "--secure-listen-address=0.0.0.0:8443"
-        - "--upstream=http://127.0.0.1:8080/"
-        - "--logtostderr=true"
-        - "--v=10"
-        ports:
-        - containerPort: 8443
-          name: https
-      - name: manager
-        args:
-        - "--metrics-addr=127.0.0.1:8080"
+  containers:
+  - name: kube-rbac-proxy
+    image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
+    args:
+    - "--secure-listen-address=0.0.0.0:8443"
+    - "--upstream=http://127.0.0.1:8080/"
+    - "--logtostderr=true"
+    - "--v=10"
+    ports:
+    - containerPort: 8443
+      name: https
+  - name: manager
+    args:
+    - "--metrics-addr=127.0.0.1:8080"
+    - "--enable-leader-election
diff --git a/pkg/resourcemanager/cosmosdbs/cosmosdb_reconcile.go b/pkg/resourcemanager/cosmosdbs/cosmosdb_reconcile.go
@@ -259,8 +259,8 @@ func (m *AzureCosmosDBManager) createOrUpdateSecret(ctx context.Context, instanc
 	}
 	secretData := map[string][]byte{
 		"primaryEndpoint":            []byte(*db.DocumentEndpoint),
-		"primaryConnectionString":    []byte(*result.PrimaryMasterKey),
-		"secondaryConnectionString":  []byte(*result.SecondaryMasterKey),
+		"primaryMasterKey":           []byte(*result.PrimaryMasterKey),
+		"secondaryMasterKey":         []byte(*result.SecondaryMasterKey),
 		"primaryReadonlyMasterKey":   []byte(*result.PrimaryReadonlyMasterKey),
 		"secondaryReadonlyMasterKey": []byte(*result.SecondaryReadonlyMasterKey),
 	}