Skip to content

Commit

Permalink
fix tslint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jaxxstorm committed Jul 24, 2020
1 parent f2ac0a6 commit d6d76f3
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions gcp-ts-gke-serviceaccount/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const name = config.get("name") ||
"gke-serviceaccount-example";
export const masterVersion = config.get("masterVersion") ||
gcp.container.getEngineVersions().then(it => it.latestMasterVersion);
const machineType = "n1-standard-1" || config.get("machineType")
const machineType = "n1-standard-1" || config.get("machineType");

// Create a service account
const serviceAccount = new gcp.serviceAccount.Account("serviceAccount", {
Expand All @@ -19,13 +19,13 @@ const serviceAccount = new gcp.serviceAccount.Account("serviceAccount", {

const serviceAccountIAM = new gcp.projects.IAMBinding("serviceAccount-pub", {
role: "roles/pubsub.subscriber",
members: [pulumi.interpolate`serviceAccount:${serviceAccount.email}`]
}, {parent: serviceAccount})
members: [pulumi.interpolate`serviceAccount:${serviceAccount.email}`],
}, {parent: serviceAccount});

const serviceAccountKey = new gcp.serviceAccount.Key("serviceAccount-key", {
serviceAccountId: serviceAccount.name,
publicKeyType: "TYPE_X509_PEM_FILE",
}, {parent: serviceAccount, additionalSecretOutputs: ['privateKey']})
}, {parent: serviceAccount, additionalSecretOutputs: ["privateKey"]});

// Create a GKE cluster
const cluster = new gcp.container.Cluster(name, {
Expand Down Expand Up @@ -90,18 +90,18 @@ const ns = new k8s.core.v1.Namespace("pubsub-ns", {
metadata: {
name: "pubsub",
labels: appLabels,
}
},
}, {provider: clusterProvider});


const gcpCredentials = new k8s.core.v1.Secret('gcp-credentials', {
const gcpCredentials = new k8s.core.v1.Secret("gcp-credentials", {
metadata: {
namespace: ns.metadata.name,
labels: appLabels,
},
type: 'Opaque',
type: "Opaque",
stringData: {
'gcp-credentials.json': serviceAccountKey.privateKey.apply((x) => Buffer.from(x, 'base64').toString('utf8')),
"gcp-credentials.json": serviceAccountKey.privateKey.apply((x) => Buffer.from(x, "base64").toString("utf8")),
},
}, {provider: clusterProvider, parent: ns});

Expand All @@ -121,11 +121,11 @@ const deployment = new k8s.apps.v1.Deployment("pubsub",
spec: {
volumes: [
{
name: 'google-cloud-key',
name: "google-cloud-key",
secret: {
secretName: gcpCredentials.metadata.name,
}
}
},
},
],
containers: [
{
Expand All @@ -134,20 +134,20 @@ const deployment = new k8s.apps.v1.Deployment("pubsub",
volumeMounts: [
{
name: "google-cloud-key",
mountPath: "/var/secrets/google"
}
mountPath: "/var/secrets/google",
},
],
env: [{
name: "GOOGLE_APPLICATION_CREDENTIALS",
value: "/var/secrets/google/gcp-credentials.json"
}]
value: "/var/secrets/google/gcp-credentials.json",
}],
},
],
},
},
},
},
{
provider: clusterProvider, parent: ns
provider: clusterProvider, parent: ns,
},
);

0 comments on commit d6d76f3

Please sign in to comment.