Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nordmart demo #52

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .idea/$CACHE_FILE$

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/nordmart-dev-apps.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions releases-istio/apps/cart-helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
kind: HelmRelease
metadata:
name: nordmart-dev-cart
namespace: nordmart-dev-apps
namespace: nordmart-demo
annotations:
flux.weave.works/automated: "true"
flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
Expand All @@ -21,15 +21,15 @@ spec:
app: cart
image:
repository: stakater/stakater-nordmart-cart
tag: v0.0.1
tag: v0.0.2
volumes: {}
env:
- name: CATALOG_ENDPOINT
value: "catalog.nordmart-dev-apps.svc.cluster.local:8080"
value: "catalog.nordmart-demo.svc.cluster.local:8080"
- name: KEYCLOAK_REALM
value: "nordmart"
- name: KEYCLOAK_URL
value: "https://keycloak-dev.DOMAIN/auth/"
value: "https://keycloak-dev.stakater-200205-1-5c84fa685b23fe4798253ee758d532d0-0000.eu-de.containers.appdomain.cloud/auth/"
- name: KEYCLOAK_CLIENT_BACKEND
value: "stakater-nordmart-backend"
- name: KEYCLOAK_CLIENT_SECRET_KEY
Expand Down
10 changes: 5 additions & 5 deletions releases-istio/apps/cassandra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app: cassandra
name: cassandra
namespace: nordmart-dev-apps
namespace: nordmart-demo
spec:
clusterIP: None
ports:
Expand All @@ -16,7 +16,7 @@ apiVersion: apps/v1beta1
kind: StatefulSet
metadata:
name: cassandra
namespace: nordmart-dev-apps
namespace: nordmart-demo
spec:
serviceName: cassandra
replicas: 1
Expand All @@ -39,7 +39,7 @@ spec:
name: cql
env:
- name: CASSANDRA_SEEDS
value: cassandra-0.cassandra.nordmart-dev-apps.svc.cluster.local
value: cassandra-0.cassandra.nordmart-demo.svc.cluster.local
- name: MAX_HEAP_SIZE
value: 512M
- name: HEAP_NEWSIZE
Expand All @@ -61,10 +61,10 @@ spec:
- metadata:
name: cassandra-pvc
annotations:
volume.beta.kubernetes.io/storage-class: STORAGE_CLASS_NAME
volume.beta.kubernetes.io/storage-class: ibmc-file-gold
spec:
accessModes: [ "ReadWriteOnce" ]
storageClassName: STORAGE_CLASS_NAME
storageClassName: ibmc-file-gold
resources:
requests:
storage: 1Gi
10 changes: 5 additions & 5 deletions releases-istio/apps/catalog-helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
kind: HelmRelease
metadata:
name: nordmart-dev-catalog
namespace: nordmart-dev-apps
namespace: nordmart-demo
annotations:
flux.weave.works/automated: "true"
flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
Expand All @@ -22,7 +22,7 @@ spec:
volumes: {}
image:
repository: stakater/stakater-nordmart-catalog
tag: v0.0.1
tag: v0.0.2
fluentdConfigAnnotations:
regex: /^(?<time>\\d+(?:-\\d+){2}\\s+\\d+(?::\\d+){2}\\.\\d+)\\s*(?<level>\\S+)
(?<pid>\\d+) --- \\[(?<thread>[\\s\\S]*?)\\] (?<class>\\S+)\\s*:\\s*(?<message>[\\s\\S]*?)(?=\\g<time>|\\Z)/
Expand All @@ -40,19 +40,19 @@ spec:
name: mysql-secret
key: mysql_password
- name: MYSQL_HOST
value: "mysql-svc.nordmart-dev-apps.svc.cluster.local"
value: "mysql-svc.nordmart-demo.svc.cluster.local"
- name: MYSQL_DB_NAME
value: "catalog"
- name: KEYCLOAK_REALM
value: "nordmart"
- name: KEYCLOAK_URL
value: "https://keycloak-dev.DOMAIN/auth/"
value: "https://keycloak-dev.stakater-200205-1-5c84fa685b23fe4798253ee758d532d0-0000.eu-de.containers.appdomain.cloud/auth/"
- name: KEYCLOAK_CLIENT_BACKEND
value: "stakater-nordmart-backend"
- name: KEYCLOAK_CLIENT_SECRET_KEY
value: "7672aea2-81ff-4aa2-affe-daf3bad10334"
- name: KAFKA_ADDRESS
value: "kafka-cluster-kafka-bootstrap.nordmart-dev-apps:9092"
value: "kafka-cluster-kafka-bootstrap.nordmart-demo:9092"
- name: JAEGER_ENDPOINT
value: "http://jaeger-collector.istio-system:14268/api/traces"

Expand Down
9 changes: 4 additions & 5 deletions releases-istio/apps/customer-helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
kind: HelmRelease
metadata:
name: nordmart-dev-customer
namespace: nordmart-dev-apps
namespace: nordmart-demo
annotations:
flux.weave.works/automated: "true"
flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
Expand All @@ -22,17 +22,16 @@ spec:
image:
repository: stakater/stakater-nordmart-customer
tag: v0.0.1
imagePullSecrets: "docker-registry-nexus-secret"
volumes: {}
env:
- name: CATALOG_ENDPOINT
value: "catalog.nordmart-dev-apps.svc.cluster.local:8080"
value: "catalog.nordmart-demo.svc.cluster.local:8080"
- name: CASSANDRA_HOST
value: "cassandra.nordmart-dev-apps.svc.cluster.local"
value: "cassandra.nordmart-demo.svc.cluster.local"
- name: KEYCLOAK_REALM
value: "nordmart"
- name: KEYCLOAK_URL
value: "https://keycloak-dev.DOMAIN/auth/"
value: "https://keycloak-dev.stakater-200205-1-5c84fa685b23fe4798253ee758d532d0-0000.eu-de.containers.appdomain.cloud/auth/"
- name: KEYCLOAK_CLIENT_BACKEND
value: "stakater-nordmart-backend"
- name: KEYCLOAK_CLIENT_SECRET_KEY
Expand Down
28 changes: 14 additions & 14 deletions releases-istio/apps/elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app: elasticsearch
name: elasticsearch-svc
namespace: nordmart-dev-apps
namespace: nordmart-demo
spec:
ports:
- name: "elasticsearch-port"
Expand All @@ -17,7 +17,7 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: elasticsearch
namespace: nordmart-dev-apps
namespace: nordmart-demo
spec:
serviceName: "elasticsearch"
selector:
Expand Down Expand Up @@ -49,15 +49,15 @@ spec:
ports:
- containerPort: 9200
name: tcp
# volumeMounts:
# - mountPath: /data
# name: elasticsearch-pvc
# volumeClaimTemplates:
# - metadata:
# name: elasticsearch-pvc
# spec:
# accessModes: [ "ReadWriteOnce" ]
# storageClassName: stakater-storageclass
# resources:
# requests:
# storage: 5Gi
volumeMounts:
- mountPath: /data
name: elasticsearch-pvc
volumeClaimTemplates:
- metadata:
name: elasticsearch-pvc
spec:
accessModes: [ "ReadWriteOnce" ]
storageClassName: ibmc-block-gold
resources:
requests:
storage: 5Gi
60 changes: 36 additions & 24 deletions releases-istio/apps/gateway-helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
kind: HelmRelease
metadata:
name: nordmart-dev-gateway
namespace: nordmart-dev-apps
namespace: nordmart-demo
annotations:
flux.weave.works/automated: "true"
flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
Expand All @@ -20,7 +20,7 @@ spec:
podLabels:
app: gateway
image:
repository: stakater/stakater-nordmart-gateway
repository: stakater/stakater-nordmart-gateway-vertx
tag: v0.0.1
fluentdConfigAnnotations:
regex: /^(?<time>\\d+(?:-\\d+){2}\\s+\\d+(?::\\d+){2}\\.\\d+)\\s*(?<level>\\S+)
Expand Down Expand Up @@ -49,58 +49,70 @@ spec:
volumes: {}
env:
- name: CATALOG_API_HOST
value: "catalog.nordmart-dev-apps.svc.cluster.local"
value: "catalog.nordmart-demo.svc.cluster.local"
- name: CATALOG_API_PORT
value: "8080"
- name: CUSTOMER_API_HOST
value: "customer.nordmart-dev-apps.svc.cluster.local"
value: "customer.nordmart-demo.svc.cluster.local"
- name: CUSTOMER_API_PORT
value: "8080"
- name: INVENTORY_API_HOST
value: "inventory.nordmart-dev-apps.svc.cluster.local"
value: "inventory.nordmart-demo.svc.cluster.local"
- name: INVENTORY_API_PORT
value: "8080"
- name: DISABLE_CART_DISCOVERY
value: "false"
- name: CART_API_HOST
value: "cart.nordmart-dev-apps.svc.cluster.local"
value: "cart.nordmart-demo.svc.cluster.local"
- name: CART_API_PORT
value: "8080"
- name: HTTP_PORT
value: "8080"
- name: REVIEW_API_HOST
value: "review.nordmart-dev-apps.svc.cluster.local"
value: "review.nordmart-demo.svc.cluster.local"
- name: REVIEW_API_PORT
value: "8080"
- name: PRODUCT_SEARCH_API_HOST
value: "search.nordmart-dev-apps"
value: "search.nordmart-demo.svc.cluster.local"
- name: PRODUCT_SEARCH_API_PORT
value: "8080"
- name: JAEGER_ENDPOINT
value: "http://jaeger-collector.istio-system:14268/api/traces"
service:
annotations:
config.xposer.stakater.com/Domain: nordmart-eks.stakater.com
config.xposer.stakater.com/IngressNameTemplate: '{{.Service}}'
config.xposer.stakater.com/IngressURLTemplate: gateway-dev.{{.Domain}}
config.xposer.stakater.com/TLS: "true"
config.xposer.stakater.com/TLSSecretNameTemplate: tls-cert
xposer.stakater.com/annotations: |-
kubernetes.io/ingress.class: internal-ingress
ingress.kubernetes.io/force-ssl-redirect: false
nginx.ingress.kubernetes.io/cors-allow-origin: "*"
exposeIngressUrl: globally
ports:
- port: 8080
name: https
targetPort: 8080
rbac:
create: true
serviceAccount:
create: true
# create: true
name: default
configMap:
enabled: false
---
apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
name: gateway-dev-virtualservice
namespace: istio-system
spec:
hosts:
- "gateway-dev.DOMAIN"
gateways:
- istio-gateway
http:
- route:
- destination:
host: gateway.nordmart-dev-apps.svc.cluster.local
# ---
# apiVersion: networking.istio.io/v1alpha3
# kind: VirtualService
# metadata:
# name: gateway-dev-virtualservice
# namespace: istio-system
# spec:
# hosts:
# - "gateway-dev.nordmart-eks.stakater.com"
# gateways:
# - istio-gateway
# http:
# - route:
# - destination:
# host: gateway.nordmart-dev-apps.svc.cluster.local
4 changes: 2 additions & 2 deletions releases-istio/apps/inventory-helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: helm.fluxcd.io/v1
kind: HelmRelease
metadata:
name: nordmart-dev-inventory
namespace: nordmart-dev-apps
namespace: nordmart-demo
annotations:
flux.weave.works/automated: "true"
flux.weave.works/tag.deployment: regexp:^([0-9]+.[0-9]+.[0-9]+-PR-[0-9]{2}-[0-9]+-SNAPSHOT)$
Expand All @@ -22,7 +22,7 @@ spec:
volumes: {}
image:
repository: stakater/stakater-nordmart-inventory
tag: v0.0.1
tag: v0.0.2
env:
- name: JAEGER_ENDPOINT
value: "http://jaeger-collector.istio-system:14268/api/traces"
Expand Down
6 changes: 3 additions & 3 deletions releases-istio/apps/kafka.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: kafka.strimzi.io/v1beta1
kind: Kafka
metadata:
name: kafka-cluster
namespace: nordmart-dev-apps
namespace: nordmart-demo
spec:
kafka:
version: 2.4.0
Expand All @@ -22,14 +22,14 @@ spec:
type: persistent-claim
size: 1Gi
deleteClaim: false
class: STORAGE_CLASS_NAME
class: ibmc-block-gold
zookeeper:
replicas: 1
storage:
type: persistent-claim
size: 1Gi
deleteClaim: false
class: STORAGE_CLASS_NAME
class: ibmc-block-gold
entityOperator:
topicOperator: {}
userOperator: {}
Loading