Skip to content

Commit 516ce67

Browse files
Merge pull request #61 from cloudkite-io/adjust-azure-secrets-format
remove data entry from the secrets
2 parents b447819 + bf49622 commit 516ce67

File tree

3 files changed

+71
-126
lines changed

3 files changed

+71
-126
lines changed

standard-app/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: standard-app
33
description: A Helm chart library by Cloudkite
44
type: application
5-
version: 0.9.6
5+
version: 0.9.7
66
maintainters:
77
88
name: cloudkite

standard-app/example.values.yaml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,7 @@ apps:
147147
args:
148148
- /etc/scripts/script1.sh
149149
secrets:
150-
data:
151-
- secretKey: SOURCE_PROJECT_ID
152-
dataFrom:
153-
version: version-number
150+
dataFrom: true
154151
containers:
155152
example-container-1:
156153
image: us-central1-docker.pkg.dev/cloudkite-infra-ops/cloudkite-docker-images/app-1
@@ -280,12 +277,9 @@ apps:
280277
APP_ENV1: foo
281278
APP_ENV2: bar
282279
secrets:
283-
data:
284280
- secretKey: appsettings.json
285281
property: APPSETTINGS_JSON
286282
- secretKey: SOURCE_PROJECT_ID
287-
dataFrom:
288-
version: version-number
289283
serviceMonitor:
290284
path: /metrics # default /metrics
291285
interval: 60s # default 30s
@@ -480,15 +474,13 @@ externalSecret:
480474
# refreshInterval: 15s
481475

482476
secrets:
483-
data:
484477
# Vault/GCP/AWS Example
485478
- secretKey: AWS_ACCESS_KEY_ID # - secretKey: & property: atribute for secrets are applicable to version 0.2.0, version 0.1.0 uses the key id without artribut names e.g (- AWS_ACCESS_KEY_ID)
486479
- secretKey: AWS_SECRET_ACCESS_KEY
487480
# Azure Example
488481
# Serilog__WriteTo__0__Args__connectionString: SERILOG_CONNECTION_STRING
489482
# TokenConfig__Secret: TOKEN_CONFIG_SECRET
490-
# dataFrom:
491-
# version: version-number
483+
# dataFrom: true
492484

493485
jobs:
494486
jobexample-1:
@@ -588,11 +580,7 @@ cronjobs:
588580
args:
589581
- /etc/scripts/script1.sh
590582
secrets:
591-
data:
592-
- secretKey: SOURCE_PROJECT_ID
593-
dataFrom:
594-
version: version-number
595-
583+
- SOURCE_PROJECT_ID
596584

597585
exampleinitcontainer-2:
598586
image: asdasd
@@ -610,9 +598,6 @@ cronjobs:
610598
command: ["/bin/sh", "-c"]
611599
args: ["node", "example_app.js"]
612600
secrets:
613-
data:
614-
- secretKey: appsettings.json
615-
property: APPSETTINGS_JSON
616-
- secretKey: SOURCE_PROJECT_ID
617-
dataFrom:
618-
version: version-number
601+
- secretKey: appsettings.json
602+
property: APPSETTINGS_JSON
603+
- secretKey: SOURCE_PROJECT_ID

0 commit comments

Comments
 (0)