Merge remote-tracking branch 'upstream/master' into sync-upstream-master

Signed-off-by: Muvaffak Onus <me@muvaf.com>
upbound · Sep 28, 2022 · eabc3b7 · eabc3b7
2 parents b480f18 + dd87bfb
commit eabc3b7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/build b/build
diff --git a/cluster/charts/crossplane/templates/clusterrole.yaml b/cluster/charts/crossplane/templates/clusterrole.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     app: {{ template "crossplane.name" . }}
     {{- include "crossplane.labels" . | indent 4 }}
+{{- if .Values.rbacManager.deploy }}
 aggregationRule:
   clusterRoleSelectors:
   - matchLabels:
@@ -19,6 +20,7 @@ metadata:
     {{- include "crossplane.labels" . | indent 4 }}
     crossplane.io/scope: "system"
     rbac.crossplane.io/aggregate-to-crossplane: "true"
+{{- end }}
 rules:
 - apiGroups:
   - ""

diff --git a/cluster/charts/crossplane/values.yaml.tmpl b/cluster/charts/crossplane/values.yaml.tmpl
@@ -30,8 +30,7 @@ provider:
 configuration:
   packages: []
 
-imagePullSecrets:
-- dockerhub
+imagePullSecrets: {}
 
 registryCaBundleConfig: {}
 
@@ -93,4 +92,4 @@ extraEnvVarsRBACManager: {}
 
 podSecurityContextCrossplane: {}
 
-podSecurityContextRBACManager: {}
+podSecurityContextRBACManager: {}
diff --git a/docs/guides/vault-as-secret-store.md b/docs/guides/vault-as-secret-store.md
@@ -220,7 +220,7 @@ spec:
 Resources:
 
 ```shell
-echo "apiVersion: gcp.crossplane.io/v1alpha1
+echo "apiVersion: gcp.secrets.crossplane.io/v1alpha1
 kind: StoreConfig
 metadata:
   name: vault