From 7effdd280e2add4b3d31d8bacc3f3635bcaf4443 Mon Sep 17 00:00:00 2001 From: jpflueger Date: Thu, 30 Apr 2020 14:12:31 -0600 Subject: [PATCH 1/2] adjusting secret name --- pkg/resourcemanager/cosmosdbs/cosmosdb_reconcile.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/resourcemanager/cosmosdbs/cosmosdb_reconcile.go b/pkg/resourcemanager/cosmosdbs/cosmosdb_reconcile.go index b0ec43081b3..f886b61b723 100644 --- 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), } From 962671a5dcc8115e32bec80b8d9c3cddf081fcb0 Mon Sep 17 00:00:00 2001 From: Erin Corson Date: Fri, 1 May 2020 12:29:03 -0600 Subject: [PATCH 2/2] upgrade kube rbac proxy to 0.5.0 --- config/default/manager_auth_proxy_patch.yaml | 31 ++++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml index d3994fb918f..b229849b053 100644 --- 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