зеркало из https://github.com/microsoft/spinnaker.git
Merge pull request #1321 from ttomsu/google-kube-ha-fiat
Adds Fiat service to Kubernetes HA config
This commit is contained in:
Travis Tomsu
GitHub
Коммит
26586b60c1
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ spec:
|
|||
name: echo-event-config
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /env
|
||||
path: /health
|
||||
port: 8089
|
||||
initialDelaySeconds: 20
|
||||
timeoutSeconds: 1
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ spec:
|
|||
name: echo-sched-config
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /env
|
||||
path: /health
|
||||
port: 8089
|
||||
initialDelaySeconds: 20
|
||||
timeoutSeconds: 1
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
bash fiat/ro/cleanup-components.sh
|
||||
bash fiat/mutate/cleanup-components.sh
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
bash fiat/ro/cleanup-config.sh
|
||||
bash fiat/mutate/cleanup-config.sh
|
||||
|
|
@ -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}
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
kubectl delete -f fiat/mutate/svcs
|
||||
kubectl delete -f fiat/mutate/rcs
|
||||
|
|
@ -0,0 +1 @@
|
|||
kubectl delete secret fiat-mutate-config --namespace spinnaker
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
kubectl create -f fiat/mutate/svcs
|
||||
kubectl create -f fiat/mutate/rcs
|
||||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
kubectl delete -f fiat/ro/svcs
|
||||
kubectl delete -f fiat/ro/rcs
|
||||
|
|
@ -0,0 +1 @@
|
|||
kubectl delete secret fiat-ro-config --namespace spinnaker
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
fiat:
|
||||
getAllEnabled: true
|
||||
writeMode:
|
||||
enabled: false
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
kubectl create -f fiat/ro/svcs
|
||||
kubectl create -f fiat/ro/rcs
|
||||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
bash fiat/ro/startup-components.sh
|
||||
bash fiat/mutate/startup-components.sh
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
bash fiat/ro/startup-config.sh
|
||||
bash fiat/mutate/startup-config.sh
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
# Uncomment below iff Fiat is enabled.
|
||||
# services:
|
||||
# fiat:
|
||||
# host: spin-fiat-mutate.${services.default.dnsSuffix}
|
||||
|
|
@ -28,7 +28,7 @@ spec:
|
|||
name: gate-config
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /env
|
||||
path: /health
|
||||
port: 8084
|
||||
initialDelaySeconds: 20
|
||||
timeoutSeconds: 1
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ spec:
|
|||
name: igor-config
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /env
|
||||
path: /health
|
||||
port: 8088
|
||||
initialDelaySeconds: 20
|
||||
timeoutSeconds: 1
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ spec:
|
|||
name: orca-config
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /env
|
||||
path: /health
|
||||
port: 8083
|
||||
initialDelaySeconds: 20
|
||||
timeoutSeconds: 1
|
||||
|
|
|
|||
|
|
@ -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: {}
|
||||
|
|
@ -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"
|
||||
|
|
@ -28,7 +28,7 @@ spec:
|
|||
name: rosco-config
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /env
|
||||
path: /health
|
||||
port: 8087
|
||||
initialDelaySeconds: 20
|
||||
timeoutSeconds: 1
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
bash ./scripts/startup-config.sh
|
||||
bash ./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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче