From cd3f3c8cdae295a8376f29f7a06c66ee1a3be7c7 Mon Sep 17 00:00:00 2001 From: Evgeni Sautin Date: Mon, 22 May 2023 11:31:45 +0300 Subject: [PATCH] Switch to a jelly namespace instead of default --- deploy/elasticsearch/service.yaml | 1 + deploy/elasticsearch/statefulsets.yaml | 1 + deploy/kibana/deployment.yaml | 1 + deploy/kibana/service.yaml | 1 + deploy/mongo/service.yaml | 1 + deploy/mongo/statefulset.yaml | 1 + deploy/secrets.yaml | 14 +++++++++----- deploy/web/deployment.yaml | 1 + deploy/web/hpa.yaml | 2 +- deploy/web/ingress.yaml | 1 + deploy/web/service.yaml | 1 + 11 files changed, 19 insertions(+), 6 deletions(-) diff --git a/deploy/elasticsearch/service.yaml b/deploy/elasticsearch/service.yaml index fac9edb..1e336f4 100644 --- a/deploy/elasticsearch/service.yaml +++ b/deploy/elasticsearch/service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: elasticsearch + namespace: jelly spec: selector: app: elasticsearch diff --git a/deploy/elasticsearch/statefulsets.yaml b/deploy/elasticsearch/statefulsets.yaml index f1afbc8..bcbb339 100644 --- a/deploy/elasticsearch/statefulsets.yaml +++ b/deploy/elasticsearch/statefulsets.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: elasticsearch + namespace: jelly spec: serviceName: elasticsearch replicas: 3 diff --git a/deploy/kibana/deployment.yaml b/deploy/kibana/deployment.yaml index 57967ce..78f05ec 100644 --- a/deploy/kibana/deployment.yaml +++ b/deploy/kibana/deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: kibana + namespace: jelly spec: replicas: 1 selector: diff --git a/deploy/kibana/service.yaml b/deploy/kibana/service.yaml index 6bc73a2..52e7f20 100644 --- a/deploy/kibana/service.yaml +++ b/deploy/kibana/service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: kibana + namespace: jelly spec: selector: app: kibana diff --git a/deploy/mongo/service.yaml b/deploy/mongo/service.yaml index 4428c03..aa83e81 100644 --- a/deploy/mongo/service.yaml +++ b/deploy/mongo/service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: mongo + namespace: jelly spec: selector: app: mongo diff --git a/deploy/mongo/statefulset.yaml b/deploy/mongo/statefulset.yaml index e048eff..c0414fa 100644 --- a/deploy/mongo/statefulset.yaml +++ b/deploy/mongo/statefulset.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: mongo + namespace: jelly spec: serviceName: mongo replicas: 1 diff --git a/deploy/secrets.yaml b/deploy/secrets.yaml index be693b3..6562f09 100644 --- a/deploy/secrets.yaml +++ b/deploy/secrets.yaml @@ -2,22 +2,24 @@ apiVersion: v1 kind: Secret metadata: name: web + namespace: jelly type: Opaque data: MONGODB_DATABASE: amVsbHk= - MONGODB_URL: bW9uZ29kYjovL3Jvb3Q6c2VjcmV0QG1vbmdvOjI3MDE3 - ELASTICSEARCH_URL: aHR0cDovL2VsYXN0aWNzZWFyY2g6OTIwMA== + MONGODB_URL: bW9uZ29kYjovL3Jvb3Q6c2VjcmV0QG1vbmdvLmplbGx5LnN2Yy5jbHVzdGVyLmxvY2FsOjI3MDE3 + ELASTICSEARCH_URL: aHR0cDovL2VsYXN0aWNzZWFyY2guamVsbHkuc3ZjLmNsdXN0ZXIubG9jYWw6OTIwMA== --- apiVersion: v1 kind: Secret metadata: name: elasticsearch + namespace: jelly type: Opaque data: xpack.security.enabled: ZmFsc2U= xpack.security.transport.ssl.enabled: ZmFsc2U= xpack.security.http.ssl.enabled: ZmFsc2U= - discovery.seed_hosts: ZWxhc3RpY3NlYXJjaC5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2Fs + discovery.seed_hosts: ZWxhc3RpY3NlYXJjaC5qZWxseS5zdmMuY2x1c3Rlci5sb2NhbA== cluster.initial_master_nodes: ZWxhc3RpY3NlYXJjaC0wLGVsYXN0aWNzZWFyY2gtMSxlbGFzdGljc2VhcmNoLTI= ES_JAVA_OPTS: LVhtczUxMm0gLVhteDUxMm0= --- @@ -25,15 +27,17 @@ apiVersion: v1 kind: Secret metadata: name: kibana + namespace: jelly type: Opaque data: - SERVER_NAME: a2liYW5hLmxvY2Fs - ELASTICSEARCH_HOSTS: aHR0cDovL2VsYXN0aWNzZWFyY2g6OTIwMA== + SERVER_NAME: a2liYW5hLmplbGx5LnN2Yy5jbHVzdGVyLmxvY2Fs + ELASTICSEARCH_HOSTS: aHR0cDovL2VsYXN0aWNzZWFyY2guamVsbHkuc3ZjLmNsdXN0ZXIubG9jYWw6OTIwMA== --- apiVersion: v1 kind: Secret metadata: name: mongo + namespace: jelly type: Opaque data: MONGO_INITDB_ROOT_USERNAME: cm9vdA== diff --git a/deploy/web/deployment.yaml b/deploy/web/deployment.yaml index cdbb65d..5f17785 100644 --- a/deploy/web/deployment.yaml +++ b/deploy/web/deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: web + namespace: jelly spec: replicas: 1 selector: diff --git a/deploy/web/hpa.yaml b/deploy/web/hpa.yaml index c32919b..252a39e 100644 --- a/deploy/web/hpa.yaml +++ b/deploy/web/hpa.yaml @@ -2,7 +2,7 @@ apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: web - namespace: default + namespace: jelly spec: scaleTargetRef: apiVersion: apps/v1 diff --git a/deploy/web/ingress.yaml b/deploy/web/ingress.yaml index 160215c..d2e8b3b 100644 --- a/deploy/web/ingress.yaml +++ b/deploy/web/ingress.yaml @@ -2,6 +2,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: web + namespace: jelly annotations: kubernetes.io/ingress.class: nginx spec: diff --git a/deploy/web/service.yaml b/deploy/web/service.yaml index 30628ca..d7b33f1 100644 --- a/deploy/web/service.yaml +++ b/deploy/web/service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: web + namespace: jelly spec: selector: app: web