From 6361c2223b23106af6885e6ee00680d04b044ca5 Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Sat, 16 Jan 2021 09:48:24 -0600 Subject: [PATCH 1/4] fix: Seperate resource manifests for kube --- infrastructure/{kube.yml => deployment.yml} | 39 ------------------- infrastructure/ingress.yml | 18 +++++++++ infrastructure/service.yml | 11 ++++++ .../{kube.yml.dot => deployment.yml.dot} | 39 ------------------- infrastructure_templates/ingress.yml.dot | 18 +++++++++ infrastructure_templates/service.yml.dot | 11 ++++++ script/generate-kube | 5 ++- 7 files changed, 61 insertions(+), 80 deletions(-) rename infrastructure/{kube.yml => deployment.yml} (51%) create mode 100644 infrastructure/ingress.yml create mode 100644 infrastructure/service.yml rename infrastructure_templates/{kube.yml.dot => deployment.yml.dot} (51%) create mode 100644 infrastructure_templates/ingress.yml.dot create mode 100644 infrastructure_templates/service.yml.dot diff --git a/infrastructure/kube.yml b/infrastructure/deployment.yml similarity index 51% rename from infrastructure/kube.yml rename to infrastructure/deployment.yml index 6fefd1cd..5191d57f 100644 --- a/infrastructure/kube.yml +++ b/infrastructure/deployment.yml @@ -1,13 +1,7 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: legendary ---- apiVersion: apps/v1 kind: Deployment metadata: name: legendary - namespace: legendary spec: replicas: 2 selector: @@ -34,36 +28,3 @@ spec: secretKeyRef: name: legendary key: secret-key-base ---- -apiVersion: v1 -kind: Service -metadata: - name: legendary - namespace: legendary -spec: - selector: - app: legendary - ports: - - protocol: TCP - port: 80 - targetPort: 4000 ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: legendary - namespace: legendary - annotations: - kubernetes.io/ingress.class: nginx -spec: - rules: - - host: legendary-demo.mythicinsight.com - http: - paths: - - backend: - service: - name: legendary - port: - number: 80 - path: / - pathType: Prefix diff --git a/infrastructure/ingress.yml b/infrastructure/ingress.yml new file mode 100644 index 00000000..c83ecbd7 --- /dev/null +++ b/infrastructure/ingress.yml @@ -0,0 +1,18 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: legendary + annotations: + kubernetes.io/ingress.class: nginx +spec: + rules: + - host: legendary-demo.mythicinsight.com + http: + paths: + - backend: + service: + name: legendary + port: + number: 80 + path: / + pathType: Prefix diff --git a/infrastructure/service.yml b/infrastructure/service.yml new file mode 100644 index 00000000..2bc51f0c --- /dev/null +++ b/infrastructure/service.yml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: legendary +spec: + selector: + app: legendary + ports: + - protocol: TCP + port: 80 + targetPort: 4000 diff --git a/infrastructure_templates/kube.yml.dot b/infrastructure_templates/deployment.yml.dot similarity index 51% rename from infrastructure_templates/kube.yml.dot rename to infrastructure_templates/deployment.yml.dot index 3c915434..857c0897 100644 --- a/infrastructure_templates/kube.yml.dot +++ b/infrastructure_templates/deployment.yml.dot @@ -1,13 +1,7 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: legendary ---- apiVersion: apps/v1 kind: Deployment metadata: name: legendary - namespace: legendary spec: replicas: 2 selector: @@ -34,36 +28,3 @@ spec: secretKeyRef: name: legendary key: secret-key-base ---- -apiVersion: v1 -kind: Service -metadata: - name: legendary - namespace: legendary -spec: - selector: - app: legendary - ports: - - protocol: TCP - port: 80 - targetPort: 4000 ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: legendary - namespace: legendary - annotations: - kubernetes.io/ingress.class: nginx -spec: - rules: - - host: legendary-demo.mythicinsight.com - http: - paths: - - backend: - service: - name: legendary - port: - number: 80 - path: / - pathType: Prefix diff --git a/infrastructure_templates/ingress.yml.dot b/infrastructure_templates/ingress.yml.dot new file mode 100644 index 00000000..c83ecbd7 --- /dev/null +++ b/infrastructure_templates/ingress.yml.dot @@ -0,0 +1,18 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: legendary + annotations: + kubernetes.io/ingress.class: nginx +spec: + rules: + - host: legendary-demo.mythicinsight.com + http: + paths: + - backend: + service: + name: legendary + port: + number: 80 + path: / + pathType: Prefix diff --git a/infrastructure_templates/service.yml.dot b/infrastructure_templates/service.yml.dot new file mode 100644 index 00000000..2bc51f0c --- /dev/null +++ b/infrastructure_templates/service.yml.dot @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: legendary +spec: + selector: + app: legendary + ports: + - protocol: TCP + port: 80 + targetPort: 4000 diff --git a/script/generate-kube b/script/generate-kube index 99b51c94..fab778e3 100755 --- a/script/generate-kube +++ b/script/generate-kube @@ -10,6 +10,7 @@ var packageText = fs.readFileSync("package.json", {encoding: "utf8"}); var packageConfig = JSON.parse(packageText); const {version} = packageConfig; -const manifestText = dots.kube({version: version}); -fs.writeFileSync("infrastructure/kube.yml", manifestText); +fs.writeFileSync("infrastructure/deployment.yml", dots.deployment({version: version})); +fs.writeFileSync("infrastructure/service.yml", dots.service({version: version})); +fs.writeFileSync("infrastructure/ingress.yml", dots.ingress({version: version})); From 533871aa15b0f79669acd8afd188750cdba7d12c Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 16 Jan 2021 15:52:32 +0000 Subject: [PATCH 2/4] chore(release): 1.2.2 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f8142391..da4ee793 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mythic-insight/legendary", - "version": "1.2.1", + "version": "1.2.2", "private": true, "description": "The Legendary Phoenix Boilerplate.", "main": "index.js", From ff30e56e98dcd7dd76c6758e66eb8820423609b8 Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Sat, 16 Jan 2021 10:01:57 -0600 Subject: [PATCH 3/4] fix: Use .yaml instead of .yml --- infrastructure/{deployment.yml => deployment.yaml} | 0 infrastructure/{ingress.yml => ingress.yaml} | 0 infrastructure/{service.yml => service.yaml} | 0 .../{deployment.yml.dot => deployment.yaml.dot} | 0 .../{ingress.yml.dot => ingress.yaml.dot} | 0 .../{service.yml.dot => service.yaml.dot} | 0 script/generate-kube | 6 +++--- 7 files changed, 3 insertions(+), 3 deletions(-) rename infrastructure/{deployment.yml => deployment.yaml} (100%) rename infrastructure/{ingress.yml => ingress.yaml} (100%) rename infrastructure/{service.yml => service.yaml} (100%) rename infrastructure_templates/{deployment.yml.dot => deployment.yaml.dot} (100%) rename infrastructure_templates/{ingress.yml.dot => ingress.yaml.dot} (100%) rename infrastructure_templates/{service.yml.dot => service.yaml.dot} (100%) diff --git a/infrastructure/deployment.yml b/infrastructure/deployment.yaml similarity index 100% rename from infrastructure/deployment.yml rename to infrastructure/deployment.yaml diff --git a/infrastructure/ingress.yml b/infrastructure/ingress.yaml similarity index 100% rename from infrastructure/ingress.yml rename to infrastructure/ingress.yaml diff --git a/infrastructure/service.yml b/infrastructure/service.yaml similarity index 100% rename from infrastructure/service.yml rename to infrastructure/service.yaml diff --git a/infrastructure_templates/deployment.yml.dot b/infrastructure_templates/deployment.yaml.dot similarity index 100% rename from infrastructure_templates/deployment.yml.dot rename to infrastructure_templates/deployment.yaml.dot diff --git a/infrastructure_templates/ingress.yml.dot b/infrastructure_templates/ingress.yaml.dot similarity index 100% rename from infrastructure_templates/ingress.yml.dot rename to infrastructure_templates/ingress.yaml.dot diff --git a/infrastructure_templates/service.yml.dot b/infrastructure_templates/service.yaml.dot similarity index 100% rename from infrastructure_templates/service.yml.dot rename to infrastructure_templates/service.yaml.dot diff --git a/script/generate-kube b/script/generate-kube index fab778e3..6fbaa589 100755 --- a/script/generate-kube +++ b/script/generate-kube @@ -11,6 +11,6 @@ var packageConfig = JSON.parse(packageText); const {version} = packageConfig; -fs.writeFileSync("infrastructure/deployment.yml", dots.deployment({version: version})); -fs.writeFileSync("infrastructure/service.yml", dots.service({version: version})); -fs.writeFileSync("infrastructure/ingress.yml", dots.ingress({version: version})); +fs.writeFileSync("infrastructure/deployment.yaml", dots.deployment({version: version})); +fs.writeFileSync("infrastructure/service.yaml", dots.service({version: version})); +fs.writeFileSync("infrastructure/ingress.yaml", dots.ingress({version: version})); From 042d3fd605fb434f3709f42e4c4689c4674cc1c5 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 16 Jan 2021 16:05:35 +0000 Subject: [PATCH 4/4] chore(release): 1.2.3 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index da4ee793..24698b9f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mythic-insight/legendary", - "version": "1.2.2", + "version": "1.2.3", "private": true, "description": "The Legendary Phoenix Boilerplate.", "main": "index.js",