Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Postgres: added passwordSecretName param to #39

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions incubator/postgres/postgres.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -157,25 +157,25 @@ local service = k.core.v1.service.mixin;
},
},

persistent(namespace, name, pgConfig=defaults.postgresConfig, metricsEnabled=false, existingClaim=name, labels={app:name}):
persistent(namespace, name, passwordSecretName, pgConfig=defaults.postgresConfig, metricsEnabled=false, existingClaim=name, labels={app:name}):
local volume = {
name: "data",
persistentVolumeClaim: {
claimName: existingClaim
}
};
base(namespace, name, pgConfig, metricsEnabled, existingClaim, labels) +
base(namespace, name, passwordSecretName, pgConfig, metricsEnabled, existingClaim, labels) +
k.extensions.v1beta1.deployment.mixin.spec.template.spec.volumes(volume),

nonPersistent(namespace, name, pgConfig=defaults.postgresConfig, metricsEnabled=false, existingClaim=name, labels={app:name})::
nonPersistent(namespace, name, passwordSecretName, pgConfig=defaults.postgresConfig, metricsEnabled=false, existingClaim=name, labels={app:name})::
local volume = {
name: "data",
emptyDir: {}
};
base(namespace, name, pgConfig, metricsEnabled, existingClaim, labels) +
base(namespace, name, passwordSecretName, pgConfig, metricsEnabled, existingClaim, labels) +
k.extensions.v1beta1.deployment.mixin.spec.template.spec.volumes(volume),

local base(namespace, name, pgConfig, metricsEnabled, existingClaim, labels) =
local base(namespace, name, passwordSecretName, pgConfig, metricsEnabled, existingClaim, labels) =
local metricsContainer = [
{
name: "metrics",
Expand Down Expand Up @@ -247,7 +247,7 @@ local service = k.core.v1.service.mixin;
name: "POSTGRES_PASSWORD",
valueFrom: {
secretKeyRef: {
name: name,
name: passwordSecretName,
key: "postgres-password"
},
},
Expand Down