From 2e50421d1349137ee303ccd3e1a97a23d61d1458 Mon Sep 17 00:00:00 2001 From: geekboy1011 Date: Wed, 7 Sep 2022 22:13:54 -0400 Subject: [PATCH] Test --- guestbook/guestbook-ui-deployment.yaml | 2 +- jsonnet-guestbook-tla/guestbook-ui.jsonnet | 59 ++++++++++------------ 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/guestbook/guestbook-ui-deployment.yaml b/guestbook/guestbook-ui-deployment.yaml index d96109b..a891516 100644 --- a/guestbook/guestbook-ui-deployment.yaml +++ b/guestbook/guestbook-ui-deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: guestbook-ui labels: - branch: ARGOCD_APP_SOURCE_TARGET_REVISION + branch: $ARGOCD_APP_SOURCE_TARGET_REVISION spec: replicas: 1 revisionHistoryLimit: 3 diff --git a/jsonnet-guestbook-tla/guestbook-ui.jsonnet b/jsonnet-guestbook-tla/guestbook-ui.jsonnet index 7ecdfb2..e2619e0 100644 --- a/jsonnet-guestbook-tla/guestbook-ui.jsonnet +++ b/jsonnet-guestbook-tla/guestbook-ui.jsonnet @@ -1,23 +1,23 @@ function ( - containerPort=80, - image="gcr.io/heptio-images/ks-guestbook-demo:0.2", - name="jsonnet-guestbook-ui", - replicas=1, - servicePort=80, - type="LoadBalancer" -) - [ - { + containerPort = 80, + image = "gcr.io/heptio-images/ks-guestbook-demo:0.2", + name = "jsonnet-guestbook-ui", + replicas = 1, + servicePort = 80, + type = "LoadBalancer") +[{ "apiVersion": "v1", "kind": "Service", "metadata": { - "name": name + "name": name, + "labels": { + "branch": ARGOCD_APP_SOURCE_TARGET_REVISION + } }, "spec": { - "ports": [ - { - "port": servicePort, - "targetPort": containerPort + "ports": [{ + "port": servicePort, + "targetPort": containerPort } ], "selector": { @@ -25,8 +25,7 @@ function ( }, "type": type } - }, - { + }, { "apiVersion": "apps/v1", "kind": "Deployment", "metadata": { @@ -37,29 +36,27 @@ function ( "revisionHistoryLimit": 3, "selector": { "matchLabels": { - "app": name + "app": name }, }, "template": { "metadata": { - "labels": { - "app": name - } + "labels": { + "app": name + } }, "spec": { - "containers": [ - { - "image": image, - "name": name, - "ports": [ - { - "containerPort": containerPort + "containers": [{ + "image": image, + "name": name, + "ports": [{ + "containerPort": containerPort + } + ] } - ] - } - ] + ] } } } } - ] +]