diff --git a/experimental/kubernetes/ha/clouddriver/cleanup-components.sh b/experimental/kubernetes/ha/clouddriver/cleanup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/clouddriver/cleanup-config.sh b/experimental/kubernetes/ha/clouddriver/cleanup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/clouddriver/startup-components.sh b/experimental/kubernetes/ha/clouddriver/startup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/clouddriver/startup-config.sh b/experimental/kubernetes/ha/clouddriver/startup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/config/spinnaker.yaml b/experimental/kubernetes/ha/config/spinnaker.yaml index e99641d..145b4fc 100644 --- a/experimental/kubernetes/ha/config/spinnaker.yaml +++ b/experimental/kubernetes/ha/config/spinnaker.yaml @@ -107,7 +107,7 @@ services: fiat: enabled: false address: 0.0.0.0 - host: spin-fiat.${services.default.dnsSuffix} + host: spin-fiat-ro.${services.default.dnsSuffix} port: 7003 baseUrl: ${services.default.protocol}://${services.fiat.host}:${services.fiat.port} @@ -219,6 +219,10 @@ services: master: host: redis-gate-master.${services.default.dnsSuffix} connection: redis://${services.redis.gate.master.host}:${services.redis.port} + fiat: + master: + host: redis-fiat-master.${services.default.dnsSuffix} + connection: redis://${services.redis.fiat.master.host}:${services.redis.port} providers: aws: diff --git a/experimental/kubernetes/ha/deck/cleanup-components.sh b/experimental/kubernetes/ha/deck/cleanup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/deck/cleanup-config.sh b/experimental/kubernetes/ha/deck/cleanup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/deck/config/settings.js b/experimental/kubernetes/ha/deck/config/settings.js index ddbcbab..7aac1e0 100644 --- a/experimental/kubernetes/ha/deck/config/settings.js +++ b/experimental/kubernetes/ha/deck/config/settings.js @@ -1,13 +1,17 @@ 'use strict'; var feedbackUrl = 'http://localhost'; -var gateHost = 'http://localhost:8084'; +var gateHost = process.env.API_HOST || 'http://localhost:8084'; var bakeryDetailUrl = gateHost + '/bakery/logs/global/{{context.status.id}}'; +var authEndpoint = process.env.AUTH_ENDPOINT || (gateHost + '/auth/user'); +var authEnabled = process.env.AUTH_ENABLED === 'true' ? true : false; +var fiatEnabled = process.env.FIAT_ENABLED === 'true' ? true : false; window.spinnakerSettings = { defaultProviders: ['aws', 'gce', 'azure', 'cf', 'kubernetes', 'titan'], feedbackUrl: feedbackUrl, gateUrl: gateHost, + authEndpoint: authEndpoint, bakeryDetailUrl: bakeryDetailUrl, pollSchedule: 30000, defaultTimeZone: 'America/New_York', // see http://momentjs.com/timezone/docs/#/data-utilities/ @@ -70,7 +74,9 @@ window.spinnakerSettings = { gistId: '32526cd608db3d811b38', fileName: 'news.md', }, + authEnabled: authEnabled, feature: { + fiatEnabled: fiatEnabled, pipelines: true, jobs: true, notifications: false, diff --git a/experimental/kubernetes/ha/deck/rcs/spin-deck.yaml b/experimental/kubernetes/ha/deck/rcs/spin-deck.yaml index 0d3b6c4..3a8e14c 100644 --- a/experimental/kubernetes/ha/deck/rcs/spin-deck.yaml +++ b/experimental/kubernetes/ha/deck/rcs/spin-deck.yaml @@ -30,6 +30,10 @@ spec: value: 0.0.0.0 - name: DECK_PORT value: "9000" + # - name: AUTH_ENABLED + # value: "true" + # - name: FIAT_ENABLED + # value: "true" ports: - containerPort: 9000 name: deck diff --git a/experimental/kubernetes/ha/deck/startup-components.sh b/experimental/kubernetes/ha/deck/startup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/deck/startup-config.sh b/experimental/kubernetes/ha/deck/startup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/echo/cleanup-components.sh b/experimental/kubernetes/ha/echo/cleanup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/echo/cleanup-config.sh b/experimental/kubernetes/ha/echo/cleanup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/echo/event/rcs/spin-echo-event.yaml b/experimental/kubernetes/ha/echo/event/rcs/spin-echo-event.yaml index 1b22fb4..1f4f72a 100644 --- a/experimental/kubernetes/ha/echo/event/rcs/spin-echo-event.yaml +++ b/experimental/kubernetes/ha/echo/event/rcs/spin-echo-event.yaml @@ -29,7 +29,7 @@ spec: name: echo-event-config readinessProbe: httpGet: - path: /env + path: /health port: 8089 initialDelaySeconds: 20 timeoutSeconds: 1 diff --git a/experimental/kubernetes/ha/echo/sched/rcs/spin-echo-sched.yaml b/experimental/kubernetes/ha/echo/sched/rcs/spin-echo-sched.yaml index 6a1e60c..dc62c2e 100644 --- a/experimental/kubernetes/ha/echo/sched/rcs/spin-echo-sched.yaml +++ b/experimental/kubernetes/ha/echo/sched/rcs/spin-echo-sched.yaml @@ -29,7 +29,7 @@ spec: name: echo-sched-config readinessProbe: httpGet: - path: /env + path: /health port: 8089 initialDelaySeconds: 20 timeoutSeconds: 1 diff --git a/experimental/kubernetes/ha/echo/startup-components.sh b/experimental/kubernetes/ha/echo/startup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/echo/startup-config.sh b/experimental/kubernetes/ha/echo/startup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/fiat/README.md b/experimental/kubernetes/ha/fiat/README.md new file mode 100644 index 0000000..e69de29 diff --git a/experimental/kubernetes/ha/fiat/cleanup-components.sh b/experimental/kubernetes/ha/fiat/cleanup-components.sh new file mode 100755 index 0000000..66577f7 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/cleanup-components.sh @@ -0,0 +1,2 @@ +bash fiat/ro/cleanup-components.sh +bash fiat/mutate/cleanup-components.sh diff --git a/experimental/kubernetes/ha/fiat/cleanup-config.sh b/experimental/kubernetes/ha/fiat/cleanup-config.sh new file mode 100755 index 0000000..80b9947 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/cleanup-config.sh @@ -0,0 +1,2 @@ +bash fiat/ro/cleanup-config.sh +bash fiat/mutate/cleanup-config.sh diff --git a/experimental/kubernetes/ha/fiat/config/fiat.yaml b/experimental/kubernetes/ha/fiat/config/fiat.yaml new file mode 100644 index 0000000..159e117 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/config/fiat.yaml @@ -0,0 +1,10 @@ +server: + port: ${services.fiat.port:7003} + address: ${services.fiat.address} + +services: + clouddriver: + baseUrl: ${services.clouddriver.ro.baseUrl} + +redis: + connection: ${services.redis.fiat.master.connection} diff --git a/experimental/kubernetes/ha/fiat/mutate/cleanup-components.sh b/experimental/kubernetes/ha/fiat/mutate/cleanup-components.sh new file mode 100755 index 0000000..7bb2e10 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/mutate/cleanup-components.sh @@ -0,0 +1,2 @@ +kubectl delete -f fiat/mutate/svcs +kubectl delete -f fiat/mutate/rcs diff --git a/experimental/kubernetes/ha/fiat/mutate/cleanup-config.sh b/experimental/kubernetes/ha/fiat/mutate/cleanup-config.sh new file mode 100755 index 0000000..fe8fa10 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/mutate/cleanup-config.sh @@ -0,0 +1 @@ +kubectl delete secret fiat-mutate-config --namespace spinnaker diff --git a/experimental/kubernetes/ha/fiat/mutate/config/fiat-local.yaml b/experimental/kubernetes/ha/fiat/mutate/config/fiat-local.yaml new file mode 100644 index 0000000..e69de29 diff --git a/experimental/kubernetes/ha/fiat/mutate/rcs/spin-fiat-mutate.yaml b/experimental/kubernetes/ha/fiat/mutate/rcs/spin-fiat-mutate.yaml new file mode 100644 index 0000000..4d14b48 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/mutate/rcs/spin-fiat-mutate.yaml @@ -0,0 +1,44 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: spin-fiat-mutate-v000 + namespace: spinnaker + labels: + app: spin + stack: fiat + detail: mutate + version: v000 +spec: + replicas: 1 + selector: + replication-controller: spin-fiat-mutate-v000 + template: + metadata: + labels: + replication-controller: spin-fiat-mutate-v000 + load-balancer-spin-fiat-mutate: "true" + spec: + containers: + - image: quay.io/spinnaker/fiat:master + name: fiat + ports: + - containerPort: 7003 + name: fiat + volumeMounts: + - mountPath: /opt/spinnaker/config + name: fiat-mutate-config + - mountPath: /root/.gcp + name: gcp-config + readinessProbe: + httpGet: + path: /health + port: 7003 + initialDelaySeconds: 20 + timeoutSeconds: 1 + volumes: + - name: fiat-mutate-config + secret: + secretName: fiat-mutate-config + - name: gcp-config + secret: + secretName: gcp-config diff --git a/experimental/kubernetes/ha/fiat/mutate/startup-components.sh b/experimental/kubernetes/ha/fiat/mutate/startup-components.sh new file mode 100755 index 0000000..090176a --- /dev/null +++ b/experimental/kubernetes/ha/fiat/mutate/startup-components.sh @@ -0,0 +1,2 @@ +kubectl create -f fiat/mutate/svcs +kubectl create -f fiat/mutate/rcs diff --git a/experimental/kubernetes/ha/fiat/mutate/startup-config.sh b/experimental/kubernetes/ha/fiat/mutate/startup-config.sh new file mode 100755 index 0000000..5f94e41 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/mutate/startup-config.sh @@ -0,0 +1,14 @@ +GCP_CREDS="" + +if [ -f $HOME/.gcp/account.json ]; then + GCP_CREDS="$GENERIC_CREDS --from-file=$HOME/.gcp/account.json" +fi + +kubectl create secret generic gcp-config --namespace=spinnaker $GCP_CREDS + +kubectl create secret generic fiat-mutate-config \ + --from-file=fiat/config/fiat.yaml \ + --from-file=fiat/mutate/config/fiat-local.yaml \ + --from-file=config/spinnaker.yaml \ + --from-file=config/spinnaker-local.yaml \ + --namespace=spinnaker diff --git a/experimental/kubernetes/ha/fiat/mutate/svcs/spin-fiat-mutate.yaml b/experimental/kubernetes/ha/fiat/mutate/svcs/spin-fiat-mutate.yaml new file mode 100644 index 0000000..5f54e13 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/mutate/svcs/spin-fiat-mutate.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: spin-fiat-mutate + namespace: spinnaker + labels: + app: spin + stack: fiat + detail: mutate +spec: + ports: + - port: 7003 + selector: + load-balancer-spin-fiat-mutate: "true" diff --git a/experimental/kubernetes/ha/fiat/ro/cleanup-components.sh b/experimental/kubernetes/ha/fiat/ro/cleanup-components.sh new file mode 100755 index 0000000..379ccc7 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/ro/cleanup-components.sh @@ -0,0 +1,2 @@ +kubectl delete -f fiat/ro/svcs +kubectl delete -f fiat/ro/rcs diff --git a/experimental/kubernetes/ha/fiat/ro/cleanup-config.sh b/experimental/kubernetes/ha/fiat/ro/cleanup-config.sh new file mode 100755 index 0000000..24add3c --- /dev/null +++ b/experimental/kubernetes/ha/fiat/ro/cleanup-config.sh @@ -0,0 +1 @@ +kubectl delete secret fiat-ro-config --namespace spinnaker diff --git a/experimental/kubernetes/ha/fiat/ro/config/fiat-local.yaml b/experimental/kubernetes/ha/fiat/ro/config/fiat-local.yaml new file mode 100644 index 0000000..a14f7b4 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/ro/config/fiat-local.yaml @@ -0,0 +1,4 @@ +fiat: + getAllEnabled: true + writeMode: + enabled: false diff --git a/experimental/kubernetes/ha/fiat/ro/rcs/spin-fiat-readonly.yaml b/experimental/kubernetes/ha/fiat/ro/rcs/spin-fiat-readonly.yaml new file mode 100644 index 0000000..544e672 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/ro/rcs/spin-fiat-readonly.yaml @@ -0,0 +1,39 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: spin-fiat-ro-v000 + namespace: spinnaker + labels: + app: spin + stack: fiat + detail: ro + version: v000 +spec: + replicas: 2 + selector: + replication-controller: spin-fiat-ro-v000 + template: + metadata: + labels: + replication-controller: spin-fiat-ro-v000 + load-balancer-spin-fiat-ro: "true" + spec: + containers: + - image: quay.io/spinnaker/fiat:master + name: fiat + ports: + - containerPort: 7003 + name: fiat + volumeMounts: + - mountPath: /opt/spinnaker/config + name: fiat-ro-config + readinessProbe: + httpGet: + path: /health + port: 7003 + initialDelaySeconds: 20 + timeoutSeconds: 1 + volumes: + - name: fiat-ro-config + secret: + secretName: fiat-ro-config diff --git a/experimental/kubernetes/ha/fiat/ro/startup-components.sh b/experimental/kubernetes/ha/fiat/ro/startup-components.sh new file mode 100755 index 0000000..f3ecf4e --- /dev/null +++ b/experimental/kubernetes/ha/fiat/ro/startup-components.sh @@ -0,0 +1,2 @@ +kubectl create -f fiat/ro/svcs +kubectl create -f fiat/ro/rcs diff --git a/experimental/kubernetes/ha/fiat/ro/startup-config.sh b/experimental/kubernetes/ha/fiat/ro/startup-config.sh new file mode 100755 index 0000000..96282a0 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/ro/startup-config.sh @@ -0,0 +1,6 @@ +kubectl create secret generic fiat-ro-config \ + --from-file=fiat/config/fiat.yaml \ + --from-file=fiat/ro/config/fiat-local.yaml \ + --from-file=config/spinnaker.yaml \ + --from-file=config/spinnaker-local.yaml \ + --namespace=spinnaker diff --git a/experimental/kubernetes/ha/fiat/ro/svcs/spin-fiat-readonly.yaml b/experimental/kubernetes/ha/fiat/ro/svcs/spin-fiat-readonly.yaml new file mode 100644 index 0000000..4162b5d --- /dev/null +++ b/experimental/kubernetes/ha/fiat/ro/svcs/spin-fiat-readonly.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: spin-fiat-ro + namespace: spinnaker + labels: + app: spin + stack: fiat + detail: ro +spec: + ports: + - port: 7003 + selector: + load-balancer-spin-fiat-ro: "true" diff --git a/experimental/kubernetes/ha/fiat/startup-components.sh b/experimental/kubernetes/ha/fiat/startup-components.sh new file mode 100755 index 0000000..c2e699d --- /dev/null +++ b/experimental/kubernetes/ha/fiat/startup-components.sh @@ -0,0 +1,2 @@ +bash fiat/ro/startup-components.sh +bash fiat/mutate/startup-components.sh diff --git a/experimental/kubernetes/ha/fiat/startup-config.sh b/experimental/kubernetes/ha/fiat/startup-config.sh new file mode 100755 index 0000000..288f045 --- /dev/null +++ b/experimental/kubernetes/ha/fiat/startup-config.sh @@ -0,0 +1,2 @@ +bash fiat/ro/startup-config.sh +bash fiat/mutate/startup-config.sh diff --git a/experimental/kubernetes/ha/front50/cleanup-components.sh b/experimental/kubernetes/ha/front50/cleanup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/front50/cleanup-config.sh b/experimental/kubernetes/ha/front50/cleanup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/front50/rcs/spin-front50.yaml b/experimental/kubernetes/ha/front50/rcs/spin-front50.yaml index 59fd516..d643ac8 100644 --- a/experimental/kubernetes/ha/front50/rcs/spin-front50.yaml +++ b/experimental/kubernetes/ha/front50/rcs/spin-front50.yaml @@ -32,7 +32,7 @@ spec: name: aws-config readinessProbe: httpGet: - path: /env + path: /info # This should be /health, see https://github.com/spinnaker/spinnaker/issues/1018 port: 8080 initialDelaySeconds: 20 timeoutSeconds: 1 diff --git a/experimental/kubernetes/ha/front50/startup-components.sh b/experimental/kubernetes/ha/front50/startup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/front50/startup-config.sh b/experimental/kubernetes/ha/front50/startup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/gate/cleanup-components.sh b/experimental/kubernetes/ha/gate/cleanup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/gate/cleanup-config.sh b/experimental/kubernetes/ha/gate/cleanup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/gate/config/gate-local.yaml b/experimental/kubernetes/ha/gate/config/gate-local.yaml index e69de29..d691479 100644 --- a/experimental/kubernetes/ha/gate/config/gate-local.yaml +++ b/experimental/kubernetes/ha/gate/config/gate-local.yaml @@ -0,0 +1,4 @@ +# Uncomment below iff Fiat is enabled. +# services: +# fiat: +# host: spin-fiat-mutate.${services.default.dnsSuffix} diff --git a/experimental/kubernetes/ha/gate/rcs/spin-gate.yaml b/experimental/kubernetes/ha/gate/rcs/spin-gate.yaml index 5be2a3f..693b2a3 100644 --- a/experimental/kubernetes/ha/gate/rcs/spin-gate.yaml +++ b/experimental/kubernetes/ha/gate/rcs/spin-gate.yaml @@ -28,7 +28,7 @@ spec: name: gate-config readinessProbe: httpGet: - path: /env + path: /health port: 8084 initialDelaySeconds: 20 timeoutSeconds: 1 diff --git a/experimental/kubernetes/ha/gate/startup-components.sh b/experimental/kubernetes/ha/gate/startup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/gate/startup-config.sh b/experimental/kubernetes/ha/gate/startup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/igor/cleanup-components.sh b/experimental/kubernetes/ha/igor/cleanup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/igor/cleanup-config.sh b/experimental/kubernetes/ha/igor/cleanup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/igor/rcs/spin-igor.yaml b/experimental/kubernetes/ha/igor/rcs/spin-igor.yaml index fde57e7..c9b6517 100644 --- a/experimental/kubernetes/ha/igor/rcs/spin-igor.yaml +++ b/experimental/kubernetes/ha/igor/rcs/spin-igor.yaml @@ -28,7 +28,7 @@ spec: name: igor-config readinessProbe: httpGet: - path: /env + path: /health port: 8088 initialDelaySeconds: 20 timeoutSeconds: 1 diff --git a/experimental/kubernetes/ha/igor/startup-components.sh b/experimental/kubernetes/ha/igor/startup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/igor/startup-config.sh b/experimental/kubernetes/ha/igor/startup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/orca/cleanup-components.sh b/experimental/kubernetes/ha/orca/cleanup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/orca/cleanup-config.sh b/experimental/kubernetes/ha/orca/cleanup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/orca/rcs/spin-orca.yaml b/experimental/kubernetes/ha/orca/rcs/spin-orca.yaml index 1f9609a..b000b3d 100644 --- a/experimental/kubernetes/ha/orca/rcs/spin-orca.yaml +++ b/experimental/kubernetes/ha/orca/rcs/spin-orca.yaml @@ -28,7 +28,7 @@ spec: name: orca-config readinessProbe: httpGet: - path: /env + path: /health port: 8083 initialDelaySeconds: 20 timeoutSeconds: 1 diff --git a/experimental/kubernetes/ha/orca/startup-components.sh b/experimental/kubernetes/ha/orca/startup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/orca/startup-config.sh b/experimental/kubernetes/ha/orca/startup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/redis/cleanup-components.sh b/experimental/kubernetes/ha/redis/cleanup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/redis/rcs/redis-fiat-master.yaml b/experimental/kubernetes/ha/redis/rcs/redis-fiat-master.yaml new file mode 100644 index 0000000..191afd0 --- /dev/null +++ b/experimental/kubernetes/ha/redis/rcs/redis-fiat-master.yaml @@ -0,0 +1,40 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: redis-fiat-master-v000 + namespace: spinnaker + labels: + app: redis + stack: fiat + detail: master + version: v000 +spec: + replicas: 1 + selector: + replication-controller: redis-fiat-master-v000 + template: + metadata: + labels: + replication-controller: redis-fiat-master-v000 + load-balancer-redis-fiat-master: "true" + app: redis + stack: fiat + detail: master + spec: + containers: + - name: redis-master + image: gcr.io/kubernetes-spinnaker/redis:v0.0.3 + env: + - name: MASTER + value: "true" + ports: + - containerPort: 6379 + resources: + limits: + cpu: "0.1" + volumeMounts: + - mountPath: /redis-master-data + name: data + volumes: + - name: data + emptyDir: {} diff --git a/experimental/kubernetes/ha/redis/startup-components.sh b/experimental/kubernetes/ha/redis/startup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/redis/svc/redis-fiat-master.yaml b/experimental/kubernetes/ha/redis/svc/redis-fiat-master.yaml new file mode 100644 index 0000000..8aa0947 --- /dev/null +++ b/experimental/kubernetes/ha/redis/svc/redis-fiat-master.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: redis-fiat-master + namespace: spinnaker + labels: + app: redis + stack: fiat + detail: master +spec: + ports: + - port: 6379 + selector: + load-balancer-redis-fiat-master: "true" diff --git a/experimental/kubernetes/ha/rosco/cleanup-components.sh b/experimental/kubernetes/ha/rosco/cleanup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/rosco/cleanup-config.sh b/experimental/kubernetes/ha/rosco/cleanup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/rosco/rcs/spin-rosco.yaml b/experimental/kubernetes/ha/rosco/rcs/spin-rosco.yaml index 73dd361..02f80be 100644 --- a/experimental/kubernetes/ha/rosco/rcs/spin-rosco.yaml +++ b/experimental/kubernetes/ha/rosco/rcs/spin-rosco.yaml @@ -28,7 +28,7 @@ spec: name: rosco-config readinessProbe: httpGet: - path: /env + path: /health port: 8087 initialDelaySeconds: 20 timeoutSeconds: 1 diff --git a/experimental/kubernetes/ha/rosco/startup-components.sh b/experimental/kubernetes/ha/rosco/startup-components.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/rosco/startup-config.sh b/experimental/kubernetes/ha/rosco/startup-config.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/scripts/cleanup-all.sh b/experimental/kubernetes/ha/scripts/cleanup-all.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/scripts/cleanup-components.sh b/experimental/kubernetes/ha/scripts/cleanup-components.sh old mode 100644 new mode 100755 index 952a001..f01c73f --- a/experimental/kubernetes/ha/scripts/cleanup-components.sh +++ b/experimental/kubernetes/ha/scripts/cleanup-components.sh @@ -6,3 +6,4 @@ bash gate/cleanup-components.sh bash deck/cleanup-components.sh bash igor/cleanup-components.sh bash rosco/cleanup-components.sh +bash fiat/cleanup-components.sh diff --git a/experimental/kubernetes/ha/scripts/cleanup-config.sh b/experimental/kubernetes/ha/scripts/cleanup-config.sh old mode 100644 new mode 100755 index 3df09c9..c1962da --- a/experimental/kubernetes/ha/scripts/cleanup-config.sh +++ b/experimental/kubernetes/ha/scripts/cleanup-config.sh @@ -6,3 +6,4 @@ bash gate/cleanup-config.sh bash deck/cleanup-config.sh bash igor/cleanup-config.sh bash rosco/cleanup-config.sh +bash fiat/cleanup-config.sh diff --git a/experimental/kubernetes/ha/scripts/connect.sh b/experimental/kubernetes/ha/scripts/connect.sh old mode 100644 new mode 100755 diff --git a/experimental/kubernetes/ha/scripts/startup-all.sh b/experimental/kubernetes/ha/scripts/startup-all.sh new file mode 100755 index 0000000..5ab2809 --- /dev/null +++ b/experimental/kubernetes/ha/scripts/startup-all.sh @@ -0,0 +1,2 @@ +bash ./scripts/startup-config.sh +bash ./scripts/startup-components.sh diff --git a/experimental/kubernetes/ha/scripts/startup-components.sh b/experimental/kubernetes/ha/scripts/startup-components.sh old mode 100644 new mode 100755 index ea37d20..e7faf45 --- a/experimental/kubernetes/ha/scripts/startup-components.sh +++ b/experimental/kubernetes/ha/scripts/startup-components.sh @@ -15,3 +15,4 @@ bash gate/startup-components.sh bash deck/startup-components.sh bash igor/startup-components.sh bash rosco/startup-components.sh +bash fiat/startup-components.sh diff --git a/experimental/kubernetes/ha/scripts/startup-config.sh b/experimental/kubernetes/ha/scripts/startup-config.sh old mode 100644 new mode 100755 index fef87d3..6ca74e1 --- a/experimental/kubernetes/ha/scripts/startup-config.sh +++ b/experimental/kubernetes/ha/scripts/startup-config.sh @@ -14,3 +14,4 @@ bash gate/startup-config.sh bash deck/startup-config.sh bash igor/startup-config.sh bash rosco/startup-config.sh +bash fiat/startup-config.sh