Update using demo namespace

Matt Raible · Matt Raible · commit 4937f620292e · 2021-05-27T16:34:36.000-06:00
diff --git a/jhipster-k8s/k8s/.yo-rc.json b/jhipster-k8s/k8s/.yo-rc.json
@@ -7,7 +7,7 @@
     "jwtSecretKey": "MGYyOWI2ZGQxMjZmNmVkNmZlNjNlN2E0ZjQyOGNmYjViMGJlNzRjODJlZTlkOTkzM2E5YjEzOTA2NDE3ZmNmZDRkNGMzMDI3ZGE2ZDA5ZGY4YTMzOGYwZDg4OGRhODc1NDgzOA==",
     "dockerRepositoryName": "mraible",
     "dockerPushCommand": "docker push",
-    "kubernetesNamespace": "default",
+    "kubernetesNamespace": "demo",
     "kubernetesServiceType": "LoadBalancer",
     "kubernetesUseDynamicStorage": true,
     "kubernetesStorageClassName": "",
diff --git a/jhipster-k8s/k8s/K8S-README.md b/jhipster-k8s/k8s/K8S-README.md
@@ -38,23 +38,23 @@ skaffold run [or] skaffold deploy
 Use these commands to find your application's IP addresses:
 
 ```
-$ kubectl get svc gateway
+$ kubectl get svc gateway -n demo
 ```
 
 ## Scaling your deployments
 
 You can scale your apps using
 
 ```
-$ kubectl scale deployment <app-name> --replicas <replica-count>
+$ kubectl scale deployment <app-name> --replicas <replica-count> -n demo
 ```
 
 ## zero-downtime deployments
 
 The default way to update a running app in kubernetes, is to deploy a new image tag to your docker registry and then deploy it using
 
 ```
-$ kubectl set image deployment/<app-name>-app <app-name>=<new-image>
+$ kubectl set image deployment/<app-name>-app <app-name>=<new-image> -n demo
 ```
 
 Using livenessProbes and readinessProbe allow you to tell Kubernetes about the state of your applications, in order to ensure availablity of your services. You will need minimum 2 replicas for every application deployment if you want to have zero-downtime deployed.
@@ -65,19 +65,19 @@ This is because the rolling upgrade strategy first stops a running replica in or
 The registry is deployed using a headless service in kubernetes, so the primary service has no IP address, and cannot get a node port. You can create a secondary service for any type, using:
 
 ```
-$ kubectl expose service jhipster-registry --type=NodePort --name=exposed-registry
+$ kubectl expose service jhipster-registry --type=NodePort --name=exposed-registry -n demo
 ```
 
 and explore the details using
 
 ```
-$ kubectl get svc exposed-registry
+$ kubectl get svc exposed-registry -n demo
 ```
 
 For scaling the JHipster registry, use
 
 ```
-$ kubectl scale statefulset jhipster-registry --replicas 3
+$ kubectl scale statefulset jhipster-registry --replicas 3 -n demo
 ```
 
 ## Troubleshooting
diff --git a/jhipster-k8s/k8s/blog-k8s/blog-deployment.yml b/jhipster-k8s/k8s/blog-k8s/blog-deployment.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: blog
-  namespace: default
+  namespace: demo
 spec:
   replicas: 1
   selector:
@@ -51,16 +51,16 @@ spec:
             - name: SPRING_PROFILES_ACTIVE
               value: prod
             - name: SPRING_CLOUD_CONFIG_URI
-              value: http://admin:${jhipster.registry.password}@jhipster-registry.default.svc.cluster.local:8761/config
+              value: http://admin:${jhipster.registry.password}@jhipster-registry.demo.svc.cluster.local:8761/config
             - name: JHIPSTER_REGISTRY_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: registry-secret
                   key: registry-admin-password
             - name: EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE
-              value: http://admin:${jhipster.registry.password}@jhipster-registry.default.svc.cluster.local:8761/eureka/
+              value: http://admin:${jhipster.registry.password}@jhipster-registry.demo.svc.cluster.local:8761/eureka/
             - name: SPRING_NEO4J_URI
-              value: bolt://blog-neo4j.default.svc.cluster.local:7687
+              value: bolt://blog-neo4j.demo.svc.cluster.local:7687
             - name: SPRING_SLEUTH_PROPAGATION_KEYS
               value: "x-request-id,x-ot-span-context"
             - name: JAVA_OPTS
diff --git a/jhipster-k8s/k8s/blog-k8s/blog-neo4j.yml b/jhipster-k8s/k8s/blog-k8s/blog-neo4j.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: blog-neo4j-pvc
-  namespace: default
+  namespace: demo
 spec:
   accessModes:
     - ReadWriteOnce
@@ -14,7 +14,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: blog-neo4j
-  namespace: default
+  namespace: demo
   labels:
     app: blog-neo4j
 type: Opaque
@@ -25,7 +25,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: blog-neo4j
-  namespace: default
+  namespace: demo
 spec:
   serviceName: blog-neo4j
   replicas: 1
@@ -65,7 +65,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: blog-neo4j
-  namespace: default
+  namespace: demo
 spec:
   selector:
     app: blog-neo4j
diff --git a/jhipster-k8s/k8s/blog-k8s/blog-service.yml b/jhipster-k8s/k8s/blog-k8s/blog-service.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: blog
-  namespace: default
+  namespace: demo
   labels:
     app: blog
 spec:
diff --git a/jhipster-k8s/k8s/gateway-k8s/gateway-deployment.yml b/jhipster-k8s/k8s/gateway-k8s/gateway-deployment.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: gateway
-  namespace: default
+  namespace: demo
 spec:
   replicas: 1
   selector:
@@ -51,16 +51,16 @@ spec:
             - name: SPRING_PROFILES_ACTIVE
               value: prod
             - name: SPRING_CLOUD_CONFIG_URI
-              value: http://admin:${jhipster.registry.password}@jhipster-registry.default.svc.cluster.local:8761/config
+              value: http://admin:${jhipster.registry.password}@jhipster-registry.demo.svc.cluster.local:8761/config
             - name: JHIPSTER_REGISTRY_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: registry-secret
                   key: registry-admin-password
             - name: EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE
-              value: http://admin:${jhipster.registry.password}@jhipster-registry.default.svc.cluster.local:8761/eureka/
+              value: http://admin:${jhipster.registry.password}@jhipster-registry.demo.svc.cluster.local:8761/eureka/
             - name: SPRING_DATASOURCE_URL
-              value: jdbc:postgresql://gateway-postgresql.default.svc.cluster.local:5432/gateway
+              value: jdbc:postgresql://gateway-postgresql.demo.svc.cluster.local:5432/gateway
             - name: SPRING_DATASOURCE_USERNAME
               value: gateway
             - name: SPRING_R2DBC_PASSWORD
@@ -69,9 +69,9 @@ spec:
                   name: gateway-postgresql
                   key: postgresql-password
             - name: SPRING_LIQUIBASE_URL
-              value: jdbc:postgresql://gateway-postgresql.default.svc.cluster.local:5432/gateway
+              value: jdbc:postgresql://gateway-postgresql.demo.svc.cluster.local:5432/gateway
             - name: SPRING_R2DBC_URL
-              value: r2dbc:postgresql://gateway-postgresql.default.svc.cluster.local:5432/gateway
+              value: r2dbc:postgresql://gateway-postgresql.demo.svc.cluster.local:5432/gateway
             - name: SPRING_SLEUTH_PROPAGATION_KEYS
               value: "x-request-id,x-ot-span-context"
             - name: JAVA_OPTS
diff --git a/jhipster-k8s/k8s/gateway-k8s/gateway-postgresql.yml b/jhipster-k8s/k8s/gateway-k8s/gateway-postgresql.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: gateway-postgresql-pvc
-  namespace: default
+  namespace: demo
 spec:
   accessModes:
     - ReadWriteOnce
@@ -14,7 +14,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: gateway-postgresql
-  namespace: default
+  namespace: demo
   labels:
     app: gateway-postgresql
 type: Opaque
@@ -25,7 +25,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: gateway-postgresql
-  namespace: default
+  namespace: demo
 spec:
   replicas: 1
   selector:
@@ -69,7 +69,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: gateway-postgresql
-  namespace: default
+  namespace: demo
 spec:
   selector:
     app: gateway-postgresql
diff --git a/jhipster-k8s/k8s/gateway-k8s/gateway-service.yml b/jhipster-k8s/k8s/gateway-k8s/gateway-service.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: gateway
-  namespace: default
+  namespace: demo
   labels:
     app: gateway
 spec:
diff --git a/jhipster-k8s/k8s/kubectl-apply.sh b/jhipster-k8s/k8s/kubectl-apply.sh
@@ -24,6 +24,7 @@ logSummary() {
 
 default() {
     suffix=k8s
+    kubectl apply -f namespace.yml
     kubectl apply -f registry-${suffix}/
     kubectl apply -f blog-${suffix}/
     kubectl apply -f gateway-${suffix}/
diff --git a/jhipster-k8s/k8s/kustomization.yml b/jhipster-k8s/k8s/kustomization.yml
@@ -1,7 +1,10 @@
 commonLabels:
   app.kubernetes.io/genereted-by: JHipster
 
+namespace: demo
+
 resources:
+  - namespace.yml
   # Individual apps
   - blog-k8s/blog-deployment.yml
   - blog-k8s/blog-service.yml
diff --git a/jhipster-k8s/k8s/namespace.yml b/jhipster-k8s/k8s/namespace.yml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: demo
diff --git a/jhipster-k8s/k8s/registry-k8s/application-configmap.yml b/jhipster-k8s/k8s/registry-k8s/application-configmap.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: application-config
-  namespace: default
+  namespace: demo
 #common configuration shared between all applications
 data:
   application.yml: |-
@@ -30,4 +30,4 @@ data:
     eureka:
       client:
         service-url:
-          defaultZone: http://admin:${spring.security.user.password}@jhipster-registry-0.jhipster-registry.default.svc.cluster.local:8761/eureka/,http://admin:${spring.security.user.password}@jhipster-registry-1.jhipster-registry.default.svc.cluster.local:8761/eureka/
+          defaultZone: http://admin:${spring.security.user.password}@jhipster-registry-0.jhipster-registry.demo.svc.cluster.local:8761/eureka/,http://admin:${spring.security.user.password}@jhipster-registry-1.jhipster-registry.demo.svc.cluster.local:8761/eureka/
diff --git a/jhipster-k8s/k8s/registry-k8s/jhipster-registry.yml b/jhipster-k8s/k8s/registry-k8s/jhipster-registry.yml
@@ -16,7 +16,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: registry-secret
-  namespace: default
+  namespace: demo
 type: Opaque
 data:
   registry-admin-password: ZTVmNzU2YWEtMmEyMy00NzE3LTgwOTMtNzcyYTRkOTliZDI4 # base64 encoded "e5f756aa-2a23-4717-8093-772a4d99bd28"
@@ -25,7 +25,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: jhipster-registry
-  namespace: default
+  namespace: demo
   labels:
     app: jhipster-registry
   annotations:
@@ -42,7 +42,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: jhipster-registry
-  namespace: default
+  namespace: demo
 spec:
   # added to circumvent kustomize bug
   volumeClaimTemplates: []
diff --git a/jhipster-k8s/k8s/store-k8s/store-deployment.yml b/jhipster-k8s/k8s/store-k8s/store-deployment.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: store
-  namespace: default
+  namespace: demo
 spec:
   replicas: 1
   selector:
@@ -51,18 +51,18 @@ spec:
             - name: SPRING_PROFILES_ACTIVE
               value: prod
             - name: SPRING_CLOUD_CONFIG_URI
-              value: http://admin:${jhipster.registry.password}@jhipster-registry.default.svc.cluster.local:8761/config
+              value: http://admin:${jhipster.registry.password}@jhipster-registry.demo.svc.cluster.local:8761/config
             - name: JHIPSTER_REGISTRY_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: registry-secret
                   key: registry-admin-password
             - name: EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE
-              value: http://admin:${jhipster.registry.password}@jhipster-registry.default.svc.cluster.local:8761/eureka/
+              value: http://admin:${jhipster.registry.password}@jhipster-registry.demo.svc.cluster.local:8761/eureka/
             - name: SPRING_DATA_MONGODB_DATABASE
               value: store
             - name: SPRING_DATA_MONGODB_URI
-              value: "mongodb://store-mongodb-0.store-mongodb.default:27017/?waitQueueMultiple=1000,store-mongodb-1.store-mongodb.default:27017/?waitQueueMultiple=1000,store-mongodb-2.store-mongodb.default:27017/?waitQueueMultiple=1000"
+              value: "mongodb://store-mongodb-0.store-mongodb.demo:27017/?waitQueueMultiple=1000,store-mongodb-1.store-mongodb.demo:27017/?waitQueueMultiple=1000,store-mongodb-2.store-mongodb.demo:27017/?waitQueueMultiple=1000"
             - name: SPRING_SLEUTH_PROPAGATION_KEYS
               value: "x-request-id,x-ot-span-context"
             - name: JAVA_OPTS
diff --git a/jhipster-k8s/k8s/store-k8s/store-mongodb.yml b/jhipster-k8s/k8s/store-k8s/store-mongodb.yml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: default
+  namespace: demo
   name: store-mongodb-config
 data:
   mongod.conf: |
@@ -15,7 +15,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: default
+  namespace: demo
   name: store-mongodb-init
 data:
   on-start.sh: |
@@ -154,7 +154,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: store-mongodb
-  namespace: default
+  namespace: demo
 spec:
   serviceName: store-mongodb
   replicas: 3
@@ -312,7 +312,7 @@ metadata:
   annotations:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
   name: store-mongodb
-  namespace: default
+  namespace: demo
 spec:
   type: ClusterIP
   clusterIP: None
diff --git a/jhipster-k8s/k8s/store-k8s/store-service.yml b/jhipster-k8s/k8s/store-k8s/store-service.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: store
-  namespace: default
+  namespace: demo
   labels:
     app: store
 spec:
