branch rename to main

bank-vaults · Jan 31, 2022 · f2f8d65 · f2f8d65
1 parent 8f64b3a
commit f2f8d65
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/anchore-analysis.yml b/.github/workflows/anchore-analysis.yml
@@ -7,7 +7,7 @@
 name: Anchore Container Scan
 on:
   push:
-    branches: [master, anchore]
+    branches: [anchore]
     paths-ignore:
       - 'README.md'
       - 'charts/**'

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [master, ]
+    branches: [main, ]
   pull_request:
-    branches: [master]
+    branches: [main]
   schedule:
     - cron: '0 19 * * 0'
 

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -2,7 +2,7 @@ name: Docker
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
 env:

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="https://raw.githubusercontent.com/banzaicloud/bank-vaults/master/docs/images/logo.svg" width="260"></p>
+<p align="center"><img src="https://raw.githubusercontent.com/banzaicloud/bank-vaults/main/docs/images/logo.svg" width="260"></p>
 
 <p align="center">
 
@@ -87,7 +87,7 @@ If you encounter any problems that is not addressed in our documentation, [open
 If you find this project useful, help us:
 
 - Support the development of this project and star this repo! :star:
-- If you use Bank-Vaults in a production environment, add yourself to the list of production [adopters](https://github.com/banzaicloud/bank-vaults/blob/master/ADOPTERS.md).:metal: <br>
+- If you use Bank-Vaults in a production environment, add yourself to the list of production [adopters](https://github.com/banzaicloud/bank-vaults/blob/main/ADOPTERS.md).:metal: <br>
 - Help new users with issues they may encounter :muscle:
 - Send a pull request with your new features and bug fixes :rocket:
 

diff --git a/charts/vault-operator/README.md b/charts/vault-operator/README.md
@@ -18,7 +18,7 @@ be deployed beforehand and configured with the `vault.config` option. YAML
 provided under this option will be converted to JSON for the final vault
 `config.json` file.
 
-> See https://github.com/banzaicloud/bank-vaults/tree/master/operator for more information on the Operator
+> See https://github.com/banzaicloud/bank-vaults/tree/main/operator for more information on the Operator
 > See https://www.vaultproject.io/docs/configuration/ for more information on storage options for Vault.
 
 ## Installing the Chart
@@ -83,10 +83,10 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 
 ## Using Vault Operator
 
-To deploy different Vault configurations (single node, HA, with AWS unsealing, with etcd backend, ...) see: https://github.com/banzaicloud/bank-vaults/tree/master/operator/deploy for more examples.
+To deploy different Vault configurations (single node, HA, with AWS unsealing, with etcd backend, ...) see: https://github.com/banzaicloud/bank-vaults/tree/main/operator/deploy for more examples.
 
 ```bash
-kubectl apply -f https://raw.githubusercontent.com/banzaicloud/bank-vaults/master/operator/deploy/cr-raft.yaml
+kubectl apply -f https://raw.githubusercontent.com/banzaicloud/bank-vaults/main/operator/deploy/cr-raft.yaml
 ```
 
 Once the Vault pods are ready (in HA setup always one is ready), it can be accessed using a `kubectl port-forward`:

diff --git a/charts/vault-secrets-webhook/README.md b/charts/vault-secrets-webhook/README.md
@@ -83,7 +83,7 @@ $ helm upgrade --namespace vswh --install vswh banzaicloud-stable/vault-secrets-
 
 ### About GKE Private Clusters
 
-When Google configure the control plane for private clusters, they automatically configure VPC peering between your Kubernetes cluster’s network in a separate Google managed project.
+When Google configures the control plane for private clusters, they automatically configure VPC peering between your Kubernetes cluster’s network in a separate Google managed project.
 
 The auto-generated rules **only** open ports 10250 and 443 between masters and nodes. This means that to use the webhook component with a GKE private cluster, you must configure an additional firewall rule to allow your masters CIDR to access your webhook pod using the port 8443.
 

diff --git a/charts/vault/README.md b/charts/vault/README.md
@@ -23,11 +23,10 @@ Please also note that scaling to more than 1 replicas can be made successfully o
 
 ## Installing the Chart
 
-To install the chart, use the following, this backs Vault with a Consul cluster:
+To install the chart, use the following:
 
 ```bash
-helm init -c;
-helm repo add banzaicloud-stable http://kubernetes-charts.banzaicloud.com/branch/master
+helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com
 helm install banzaicloud-stable/vault
 ```
 

diff --git a/examples/istio/cr-istio.yaml b/examples/istio/cr-istio.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   size: 1
   image: vault:1.3.1
-  bankVaultsImage: banzaicloud/bank-vaults:master
+  bankVaultsImage: banzaicloud/bank-vaults:main
 
   # Common annotations for all created resources
   annotations:
@@ -208,4 +208,4 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 1Gi
+      storage: 1Gi
diff --git a/operator/deploy/cr-awskms.yaml b/operator/deploy/cr-awskms.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   size: 1
   image: vault:1.6.2
-  bankVaultsImage: banzaicloud/bank-vaults:master
+  bankVaultsImage: banzaicloud/bank-vaults:main
 
   serviceAccount: vault
 

diff --git a/operator/deploy/cr-file.yaml b/operator/deploy/cr-file.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   size: 1
   image: vault:1.6.2
-  bankVaultsImage: banzaicloud/bank-vaults:master
+  bankVaultsImage: banzaicloud/bank-vaults:main
 
   serviceAccount: vault
 

diff --git a/operator/deploy/cr-gcpkms.yaml b/operator/deploy/cr-gcpkms.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   size: 1
   image: vault:1.6.2
-  bankVaultsImage: banzaicloud/bank-vaults:master
+  bankVaultsImage: banzaicloud/bank-vaults:main
 
   serviceAccount: vault
 

diff --git a/operator/pkg/apis/vault/v1alpha1/vault_types.go b/operator/pkg/apis/vault/v1alpha1/vault_types.go
@@ -177,7 +177,7 @@ type VaultSpec struct {
 	// - Plugin Backends
 	// - Policies
 	// - Startup Secrets (Bank Vaults feature)
-	// A documented example: https://github.com/banzaicloud/bank-vaults/blob/master/vault-config.yml
+	// A documented example: https://github.com/banzaicloud/bank-vaults/blob/main/vault-config.yml
 	// default:
 	ExternalConfig extv1beta1.JSON `json:"externalConfig,omitempty"`