Skip to content

Commit

Permalink
original-compiled
Browse files Browse the repository at this point in the history
  • Loading branch information
@ademariag
ademariag committed Apr 11, 2024
1 parent 0c6d3ec commit dd2844c
Show file tree
Hide file tree
Showing 18 changed files with 58 additions and 32 deletions.
5 changes: 2 additions & 3 deletions .kapitan
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
version: 0.32
version: 0.33
compile:
prune: true
embed-refs: true
fetch: true
yaml-dump-null-as-empty: true
compose-node-name: true
refs-path: ./system/refs
jinja2-filters: ./system/templates/jinja2_filters.py
search-paths:
Expand All @@ -13,4 +12,4 @@ compile:
- ./system/lib
- ./system/generators
refs:
refs-path: ./system/refs
refs-path: ./system/refs
27 changes: 27 additions & 0 deletions compiled/examples/manifests/logstash-config.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
apiVersion: v1
data:
logstash.yml: "log.level: info\nqueue.max_bytes: 4gb\nqueue.type: persisted\nhttp.host:\
\ 0.0.0.0"
pipelines.yml: "- pipeline.id: example\n path.config: \"/usr/share/logstash/pipeline/example.conf\"\
\n pipeline.workers: 1\n pipeline.batch.size: 200\n queue.type: persisted"
kind: ConfigMap
metadata:
labels:
app.kapicorp.dev/component: logstash
name: logstash
name: logstash-config
namespace: examples
---
apiVersion: v1
data:
example.conf: "input { stdin { } }\n\nfilter {\n grok {\n match => { \"message\"\
\ => \"%{COMBINEDAPACHELOG}\" }\n }\n date {\n match => [ \"timestamp\" ,\
\ \"dd/MMM/yyyy:HH:mm:ss Z\" ]\n }\n}\n\noutput {\n elasticsearch { hosts =>\
\ [\"localhost:9200\"] }\n stdout { codec => rubydebug }\n}"
kind: ConfigMap
metadata:
labels:
app.kapicorp.dev/component: logstash
name: logstash
name: logstash-pipelines
namespace: examples
4 changes: 2 additions & 2 deletions inventory/classes/components/echo-server.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ parameters:
# Healthchecks definitions
healthcheck:
liveness:
type: http
type: HTTP
port: http
httpHeaders:
- name: Host
value: www.google.com
path: /_health
timeout_seconds: 3
readiness:
type: http
type: HTTP
port: http
path: /_ready
timeout_seconds: 5
Expand Down
4 changes: 2 additions & 2 deletions inventory/classes/components/gke-pvm-killer.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ parameters:
service_port: 9001
healthcheck:
readiness:
type: http
type: HTTP
port: liveness
path: /liveness
timeout_seconds: 3
liveness:
type: http
type: HTTP
port: liveness
path: /liveness
timeout_seconds: 3
Expand Down
2 changes: 1 addition & 1 deletion inventory/classes/components/logstash.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ parameters:
container_port: 9600
healthcheck:
readiness:
type: http
type: HTTP
port: 9600
path: /
timeout_seconds: 3
Expand Down
2 changes: 1 addition & 1 deletion inventory/classes/components/postgres-proxy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ parameters:
update_mode: Auto
healthcheck:
liveness:
type: tcp
type: TCP
port: postgresql
timeout_seconds: 1
service:
Expand Down
4 changes: 2 additions & 2 deletions inventory/classes/components/pritunl/pritunl-mongo.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ parameters:
MONGODB_DATABASE: ${pritunl:database:name}
healthcheck:
readiness:
type: command
type: EXEC
command:
- mongo
- --eval
- "db.adminCommand('ping')"
timeout_seconds: 5
liveness:
type: command
type: EXEC
command:
- mongo
- --eval
Expand Down
4 changes: 2 additions & 2 deletions inventory/classes/components/pritunl/pritunl.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ parameters:
service_port: 443
healthcheck:
readiness:
type: http
type: HTTP
scheme: HTTPS
port: webui
path: /
timeout_seconds: 3
liveness:
type: http
type: HTTP
scheme: HTTPS
port: webui
path: /
Expand Down
4 changes: 2 additions & 2 deletions inventory/classes/components/vault.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ parameters:
- sleep 5 && kill -SIGTERM $(pidof vault)
healthcheck:
liveness:
type: command
type: EXEC
command:
- /bin/sh
- -ec
Expand All @@ -225,7 +225,7 @@ parameters:
success_threshold: 1
timeout_seconds: 5
readiness:
type: command
type: EXEC
command:
- /bin/sh
- -ec
Expand Down
4 changes: 2 additions & 2 deletions inventory/classes/components/weaveworks/carts.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ parameters:
- NET_BIND_SERVICE
healthcheck:
readiness:
type: http
type: HTTP
port: http
path: /health
initial_delay_seconds: 120
timeout_seconds: 3
liveness:
type: http
type: HTTP
port: http
path: /health
initial_delay_seconds: 120
Expand Down
4 changes: 2 additions & 2 deletions inventory/classes/components/weaveworks/catalogue.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ parameters:
- NET_BIND_SERVICE
healthcheck:
readiness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 3
liveness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 5
4 changes: 2 additions & 2 deletions inventory/classes/components/weaveworks/front-end.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ parameters:
- all
healthcheck:
readiness:
type: http
type: HTTP
port: http
path: /
timeout_seconds: 3
liveness:
type: http
type: HTTP
port: http
path: /
timeout_seconds: 5
Expand Down
4 changes: 2 additions & 2 deletions inventory/classes/components/weaveworks/orders.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ parameters:
service_port: 80
healthcheck:
readiness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 3
initial_delay_seconds: 120
liveness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 5
Expand Down
4 changes: 2 additions & 2 deletions inventory/classes/components/weaveworks/payment.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ parameters:
- NET_BIND_SERVICE
healthcheck:
readiness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 3
liveness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 5
4 changes: 2 additions & 2 deletions inventory/classes/components/weaveworks/queue-master.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ parameters:
service_port: 80
healthcheck:
readiness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 3
liveness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 5
Expand Down
4 changes: 2 additions & 2 deletions inventory/classes/components/weaveworks/shipping.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ parameters:
- NET_BIND_SERVICE
healthcheck:
readiness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 3
initial_delay_seconds: 120
liveness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 5
Expand Down
4 changes: 2 additions & 2 deletions inventory/classes/components/weaveworks/user.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ parameters:
runAsUser: 10001
healthcheck:
readiness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 3
liveness:
type: http
type: HTTP
port: http
path: /health
timeout_seconds: 5
Expand Down
2 changes: 1 addition & 1 deletion kapitan
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -o nounset -o pipefail -o noclobber -o errexit

DIR=$(dirname ${BASH_SOURCE[0]})
ABS_PATH=$(cd "${DIR}"; pwd)
KAPITAN_IMAGE=kapicorp/kapitan:v0.32.0
KAPITAN_IMAGE=kapicorp/kapitan:test-continue-on-error

KAPITAN_BINARY="docker run --rm -i -u $UID --network host -w $PWD \
-v $PWD:$PWD:delegated \
Expand Down

0 comments on commit dd2844c

Please sign in to comment.