6 Commits

6 changed files with 14 additions and 26 deletions

View File

@@ -23,7 +23,7 @@ spec:
resources:
requests:
storage: 5Gi
storageClassName: api-cache-pv
# storageClassName: api-cache-pv
---
apiVersion: v1
kind: Service

View File

@@ -176,7 +176,7 @@ spec:
resources:
requests:
storage: 5Gi
storageClassName: api-logger-prometheus-pv
#storageClassName: api-logger-prometheus-pv
---
apiVersion: v1
kind: ServiceAccount
@@ -340,7 +340,7 @@ spec:
resources:
requests:
storage: 5Gi
storageClassName: api-logger-grafana-pv
#storageClassName: api-logger-grafana-pv
---
apiVersion: apps/v1
kind: Deployment

View File

@@ -106,11 +106,11 @@ spec:
# args:
# - --web.listen-address=:9090
# - --web.telemetry-path=/metrics
- name: identity-chronos # Scheduler Container
- name: identity-scheduler # Scheduler Container
image: git.ego.freeddns.org/egommerce/identity-svc:dev
imagePullPolicy: Always
command: [
"/usr/local/bin/chronos"
"/usr/local/bin/scheduler"
]
resources:
limits:

View File

@@ -23,7 +23,7 @@ spec:
resources:
requests:
storage: 5Gi
storageClassName: db-postgres-pv
#storageClassName: db-postgres-pv
---
apiVersion: v1
kind: Service

View File

@@ -106,11 +106,11 @@ spec:
# args:
# - --web.listen-address=:9090
# - --web.telemetry-path=/metrics
- name: identity-chronos # Scheduler Container
- name: identity-scheduler # Scheduler Container
image: git.ego.freeddns.org/egommerce/identity-svc:dev
imagePullPolicy: Always
command: [
"/usr/local/bin/chronos"
"/usr/local/bin/scheduler"
]
resources:
limits:

View File

@@ -39,7 +39,6 @@ mkdir -p \
${CERTS_DIR}api-cache \
${CERTS_DIR}api-logger \
${CERTS_DIR}db-postgres \
# ${CERTS_DIR}db-mongo \
${CERTS_DIR}identity-svc \
${CERTS_DIR}basket-svc \
${CERTS_DIR}catalog-svc \
@@ -47,12 +46,12 @@ mkdir -p \
${CERTS_DIR}pricing-svc
# Generate Root CA cert
# openssl req -newkey rsa:2048 -nodes -x509 -days 1024 \
# -subj "/C=PL/ST=Silesia/L=Gliwice/O=Egommerce.dev/OU=DevOps Team/CN=Egommerce CA" \
# -keyout ${CERTS_DIR}ca-root/ca-root.key -out ${CERTS_DIR}ca-root/ca-root.crt >/dev/null
openssl req -newkey rsa:2048 -nodes -x509 -days 1024 \
-subj "/C=PL/ST=Silesia/L=Gliwice/O=Egommerce.dev/OU=DevOps Team/CN=Egommerce CA" \
-keyout ${CERTS_DIR}ca-root/ca-root.key -out ${CERTS_DIR}ca-root/ca-root.crt >/dev/null
# Create fullchain pem file
# cat ${CERTS_DIR}ca-root/ca-root.key ${CERTS_DIR}ca-root/ca-root.crt > ${CERTS_DIR}ca-root/ca-root.pem
cat ${CERTS_DIR}ca-root/ca-root.key ${CERTS_DIR}ca-root/ca-root.crt > ${CERTS_DIR}ca-root/ca-root.pem
# Generate Gateway cert
@@ -70,6 +69,7 @@ openssl x509 -req -days 365 \
# Create fullchain pem file
cat ${CERTS_DIR}api-gateway/api-gateway.key ${CERTS_DIR}api-gateway/api-gateway.crt > ${CERTS_DIR}api-gateway/api-gateway.pem
# Generate Eventbus cert
openssl req -newkey rsa:2048 -nodes \
-subj "/C=PL/ST=Silesia/L=Gliwice/O=Egommerce.dev/CN=$EVENTBUS_CN" \
@@ -108,6 +108,7 @@ openssl x509 -req -days 365 \
-extensions SAN -extfile <(cat /etc/ssl/openssl.cnf <(printf "\n[SAN]\nsubjectAltName=${LOGGER_SAN}")) \
-out ${CERTS_DIR}api-logger/api-logger.crt >/dev/null
# Generate Postgres cert
openssl req -newkey rsa:2048 -nodes \
-subj "/C=PL/ST=Silesia/L=Gliwice/O=Egommerce.dev/CN=$POSTGRES_CN" \
@@ -121,19 +122,6 @@ openssl x509 -req -days 365 \
-out ${CERTS_DIR}db-postgres/db-postgres.crt >/dev/null
# Generate Mongo cert
# openssl req -newkey rsa:2048 -nodes \
# -subj "/C=PL/ST=Silesia/L=Gliwice/O=Egommerce.dev/CN=$MONGO_CN" \
# -keyout ${CERTS_DIR}db-mongo/db-mongo.key \
# -out ${CERTS_DIR}db-mongo/db-mongo.csr >/dev/null
# openssl x509 -req -days 365 \
# -in ${CERTS_DIR}db-mongo/db-mongo.csr -CA ${CERTS_DIR}ca-root/ca-root.crt \
# -CAkey ${CERTS_DIR}ca-root/ca-root.key -set_serial 01 \
# -extensions SAN -extfile <(cat /etc/ssl/openssl.cnf <(printf "\n[SAN]\nsubjectAltName=${MONGO_SAN}")) \
# -out ${CERTS_DIR}db-mongo/db-mongo.crt >/dev/null
# Generate Identity cert
openssl req -newkey rsa:2048 -nodes \
-subj "/C=PL/ST=Silesia/L=Gliwice/O=Egommerce.dev/CN=$IDENTITY_CN" \