@@ -15,23 +15,6 @@ local kausal = import 'ksonnet-util/kausal.libsonnet';
15
15
16
16
local secret = k.core.v1.secret,
17
17
18
- // TODO: Remove once we are ready to migrate storage backend in ops-eu-south-0
19
- // Add GCS storage settings from a secret
20
- withStorageGCSFromSecret(secret_name, secret_key, bucket):: {
21
- _config+:: { vault+: { config+: {
22
- // See https://www.vaultproject.io/docs/configuration/storage/
23
- // for other storage backends
24
- storage+: {
25
- gcs+: {
26
- bucket: bucket,
27
- credentials_file: '/var/run/secrets/gcs-auth/%s' % secret_key,
28
- ha_enabled: 'true' ,
29
- },
30
- },
31
- } } },
32
- statefulset+: k.util.secretVolumeMount(secret_name, '/var/run/secrets/gcs-auth' ),
33
- },
34
-
35
18
withStorageDynamoDB(region, table):: {
36
19
_config+:: { vault+: { config+: {
37
20
storage+: {
@@ -44,14 +27,6 @@ local kausal = import 'ksonnet-util/kausal.libsonnet';
44
27
} } },
45
28
},
46
29
47
- // TODO: Replace with withStorageDynamoDB once we are ready to migrate ops-eu-south-0
48
- // Create the secret from a service account key and add the settings
49
- withStorageGCS(bucket, key):: {
50
- gcs_auth_secret:
51
- secret.new('gcs-auth' , { key: key }),
52
-
53
- } + self .withStorageGCSFromSecret('gcs-auth' , 'key' , bucket),
54
-
55
30
// Add GCP KMS settings from a secret
56
31
withGoogleCloudKMSFromSecret(secret_name, secret_key, project, location, key_ring, crypto_key):: {
57
32
_config+:: { vault+: { config+: {
0 commit comments