Simplifying external blobstore examples, and adding GCP examples

charts/sourcegraph/examples/aws/override.yaml

@@ -145,7 +145,9 @@ migrator:
 executor:
   frontendUrl: "http://sourcegraph-frontend:30080" # Use cluster-local DNS name, to avoid paying extra for network traffic
   frontendPassword: "long_random_password_which_matches_in_site_config"
-  queueNames: [ "batches", "codeintel" ]
+  queueNames:
+    - "batches"
+    - "codeintel"
 
 ################################################################################
 # Extra resources

charts/sourcegraph/examples/external-object-storage/aws-s3-access-key-authentication.yaml

@@ -0,0 +1,47 @@
+# Override file demonstrating the use of external Object Storage services
+# Learn more from the tutorial below
+# - https://docs.sourcegraph.com/admin/install/kubernetes/helm#using-external-object-storage
+
+# Using an AWS S3 bucket, with access key authentication
+
+# Disable deployment of the built-in object storage
+blobstore:
+  enabled: false
+
+# Use YAML anchors and aliases to keep override file clean
+x-object-storage-env: &objectStorageEnv
+  SOURCEGRAPH_UPLOAD_BACKEND:
+    value: S3
+  SOURCEGRAPH_UPLOAD_BUCKET:
+    value: sourcegraph-bucket
+  SOURCEGRAPH_UPLOAD_AWS_ENDPOINT: # Optional
+    value: https://s3.us-east-1.amazonaws.com
+  SOURCEGRAPH_UPLOAD_AWS_REGION:
+    value: us-east-1
+  SOURCEGRAPH_UPLOAD_MANAGE_BUCKET:
+    value: "false"
+  SOURCEGRAPH_UPLOAD_AWS_ACCESS_KEY_ID:
+    secretKeyRef:
+      name: sourcegraph-s3-credentials # Pre-existing Kubernetes secret, not created by this Helm chart
+      key: SOURCEGRAPH_UPLOAD_AWS_ACCESS_KEY_ID
+  SOURCEGRAPH_UPLOAD_AWS_SECRET_ACCESS_KEY:
+    secretKeyRef:
+      name: sourcegraph-s3-credentials
+      key: SOURCEGRAPH_UPLOAD_AWS_SECRET_ACCESS_KEY
+
+# Apply the needed configs to the pods which use blob storage
+frontend:
+  env:
+    <<: *objectStorageEnv
+
+preciseCodeIntel:
+  env:
+    <<: *objectStorageEnv
+
+syntacticCodeIntel:
+  env:
+    <<: *objectStorageEnv
+
+worker:
+  env:
+    <<: *objectStorageEnv

charts/sourcegraph/examples/external-object-storage/aws-s3-irsa-authentication.yaml

@@ -0,0 +1,50 @@
+# Override file demonstrating the use of external Object Storage services
+# Learn more from the tutorial below
+# - https://docs.sourcegraph.com/admin/install/kubernetes/helm#using-external-object-storage
+
+# Using an AWS S3 bucket, with IRSA authentication
+
+# Disable deployment of the built-in object storage
+blobstore:
+  enabled: false
+
+# Use YAML anchors and aliases to keep override file clean
+x-object-storage-env: &objectStorageEnv
+  SOURCEGRAPH_UPLOAD_BACKEND:
+    value: S3
+  SOURCEGRAPH_UPLOAD_BUCKET:
+    value: sourcegraph-bucket
+  SOURCEGRAPH_UPLOAD_AWS_ENDPOINT: # Optional
+    value: https://s3.us-east-1.amazonaws.com
+  SOURCEGRAPH_UPLOAD_AWS_REGION:
+    value: us-east-1
+  SOURCEGRAPH_UPLOAD_MANAGE_BUCKET:
+    value: "false"
+  SOURCEGRAPH_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS:
+    value: "true"
+
+# Pods must run using a Kubernetes service account with the IRSA role annotation
+x-service-account: &serviceAccount
+  create: false
+  name: sourcegraph-irsa
+
+# Apply the needed configs to the pods which use blob storage
+frontend:
+  env:
+    <<: *objectStorageEnv
+  serviceAccount: *serviceAccount
+
+preciseCodeIntel:
+  env:
+    <<: *objectStorageEnv
+  serviceAccount: *serviceAccount
+
+syntacticCodeIntel:
+  env:
+    <<: *objectStorageEnv
+  serviceAccount: *serviceAccount
+
+worker:
+  env:
+    <<: *objectStorageEnv
+  serviceAccount: *serviceAccount

charts/sourcegraph/examples/external-object-storage/gcp-gcs-service-account-key.yaml

@@ -0,0 +1,39 @@
+# Override file demonstrating the use of external Object Storage services
+# Learn more from the tutorial below
+# - https://docs.sourcegraph.com/admin/install/kubernetes/helm#using-external-object-storage
+
+# Using a GCP GCS bucket, with an application credentials file from a service account
+
+# Disable deployment of the built-in object storage
+blobstore:
+  enabled: false
+
+# Use YAML anchors and aliases to keep override file clean
+x-object-storage-env: &objectStorageEnv
+  SOURCEGRAPH_UPLOAD_BACKEND:
+    value: GCS
+  SOURCEGRAPH_UPLOAD_BUCKET:
+    value: sourcegraph-bucket
+  SOURCEGRAPH_UPLOAD_MANAGE_BUCKET:
+    value: "false"
+  SOURCEGRAPH_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE_CONTENT:
+    secretKeyRef:
+      name: sourcegraph-gcs-credentials # Pre-existing Kubernetes secret, not created by this Helm chart
+      key: SOURCEGRAPH_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE_CONTENT
+
+# Apply the needed configs to the pods which use blob storage
+frontend:
+  env:
+    <<: *objectStorageEnv
+
+preciseCodeIntel:
+  env:
+    <<: *objectStorageEnv
+
+syntacticCodeIntel:
+  env:
+    <<: *objectStorageEnv
+
+worker:
+  env:
+    <<: *objectStorageEnv

charts/sourcegraph/examples/external-object-storage/gcp-gcs-workload-identity.yaml

@@ -0,0 +1,35 @@
+# Override file demonstrating the use of external Object Storage services
+# Learn more from the tutorial below
+# - https://docs.sourcegraph.com/admin/install/kubernetes/helm#using-external-object-storage
+
+# Using a GCP GCS bucket, with workload identity authentication
+
+# Disable deployment of the built-in object storage
+blobstore:
+  enabled: false
+
+# Use YAML anchors and aliases to keep override file clean
+x-object-storage-env: &objectStorageEnv
+  SOURCEGRAPH_UPLOAD_BACKEND:
+    value: GCS
+  SOURCEGRAPH_UPLOAD_BUCKET:
+    value: sourcegraph-bucket
+  SOURCEGRAPH_UPLOAD_MANAGE_BUCKET:
+    value: "false"
+
+# Apply the needed configs to the pods which use blob storage
+frontend:
+  env:
+    <<: *objectStorageEnv
+
+preciseCodeIntel:
+  env:
+    <<: *objectStorageEnv
+
+syntacticCodeIntel:
+  env:
+    <<: *objectStorageEnv
+
+worker:
+  env:
+    <<: *objectStorageEnv