From 661b1ab03d07b6b1e25c7badcbfe9ef9739eb851 Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Wed, 29 Apr 2020 15:52:30 +0500 Subject: [PATCH 01/10] Set deploy app to true --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 024e01a2..57c1b468 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,5 +3,5 @@ appWithDockerfileBuildRelease { dockerRepositoryURL = 'docker-delivery.stakater.com:443' - deployApp = false + deployApp = true } \ No newline at end of file From a850703a01e352b6ceac8bf464555df3df5f1fa0 Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Wed, 29 Apr 2020 16:06:32 +0500 Subject: [PATCH 02/10] Downgrade stakater pipeline library --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 57c1b468..652ea25a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -@Library('github.com/stakater/stakater-pipeline-library@v2.16.26') _ +@Library('github.com/stakater/stakater-pipeline-library@v2.16.22') _ appWithDockerfileBuildRelease { dockerRepositoryURL = 'docker-delivery.stakater.com:443' From cb7cee3150fd7dd14bfdda434bfb332fa5a2396a Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Wed, 29 Apr 2020 16:17:26 +0500 Subject: [PATCH 03/10] Remove templates --- .vuepress/config.js | 2 +- .../chart/StakaterCloudDocs/Chart.yaml | 12 ------ .../StakaterCloudDocs/templates/_helpers.tpl | 24 ------------ .../templates/deployment.yaml | 29 --------------- .../StakaterCloudDocs/templates/service.yaml | 20 ---------- .../chart/StakaterCloudDocs/values.yaml | 37 ------------------- 6 files changed, 1 insertion(+), 123 deletions(-) delete mode 100644 deployments/kubernetes/chart/StakaterCloudDocs/Chart.yaml delete mode 100644 deployments/kubernetes/chart/StakaterCloudDocs/templates/_helpers.tpl delete mode 100644 deployments/kubernetes/chart/StakaterCloudDocs/templates/deployment.yaml delete mode 100644 deployments/kubernetes/chart/StakaterCloudDocs/templates/service.yaml delete mode 100644 deployments/kubernetes/chart/StakaterCloudDocs/values.yaml diff --git a/.vuepress/config.js b/.vuepress/config.js index e095fc35..d675ce97 100644 --- a/.vuepress/config.js +++ b/.vuepress/config.js @@ -30,7 +30,7 @@ module.exports = { } ] }, - repo: 'stakater/StakaterCloudDocs', + repo: 'stakater/stakaterclouddocs', editLinks: true, editLinkText: 'Help us improve this page!' } diff --git a/deployments/kubernetes/chart/StakaterCloudDocs/Chart.yaml b/deployments/kubernetes/chart/StakaterCloudDocs/Chart.yaml deleted file mode 100644 index 6cfc16d2..00000000 --- a/deployments/kubernetes/chart/StakaterCloudDocs/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -name: stakater-cloud-docs -description: Stakater Cloud Documentation -version: 1.0.0 -keywords: - - stakater - - cloud - - openshift -home: https://github.com/stakater/stakaterclouddocs -maintainers: -- name: Stakater - email: hello@stakater.com diff --git a/deployments/kubernetes/chart/StakaterCloudDocs/templates/_helpers.tpl b/deployments/kubernetes/chart/StakaterCloudDocs/templates/_helpers.tpl deleted file mode 100644 index 395cf62e..00000000 --- a/deployments/kubernetes/chart/StakaterCloudDocs/templates/_helpers.tpl +++ /dev/null @@ -1,24 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "stakater-cloud-docs.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "stakater-cloud-docs.labels.selector" -}} -app: {{ template "stakater-cloud-docs.name" . }} -group: {{ .Values.stakaterclouddocs.labels.group }} -provider: {{ .Values.stakaterclouddocs.labels.provider }} -{{- end -}} - -{{- define "stakater-cloud-docs.labels.stakater" -}} -{{ template "stakater-cloud-docs.labels.selector" . }} -version: "{{ .Values.stakaterclouddocs.labels.version }}" -{{- end -}} - -{{- define "stakater-cloud-docs.labels.chart" -}} -chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" -release: {{ .Release.Name | quote }} -heritage: {{ .Release.Service | quote }} -{{- end -}} diff --git a/deployments/kubernetes/chart/StakaterCloudDocs/templates/deployment.yaml b/deployments/kubernetes/chart/StakaterCloudDocs/templates/deployment.yaml deleted file mode 100644 index a44bc661..00000000 --- a/deployments/kubernetes/chart/StakaterCloudDocs/templates/deployment.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: apps/v1beta1 -kind: Deployment -metadata: - labels: -{{ include "stakater-cloud-docs.labels.stakater" . | indent 4 }} -{{ include "stakater-cloud-docs.labels.chart" . | indent 4 }} - name: {{ template "stakater-cloud-docs.name" . }} -{{ if .Values.stakaterclouddocs.deployment.annotations }} - annotations: -{{ toYaml .Values.stakaterclouddocs.deployment.annotations | indent 4 }} -{{ end }} -spec: - replicas: {{ .Values.stakaterclouddocs.deployment.replicas }} - template: - metadata: - labels: -{{ toYaml .Values.stakaterclouddocs.deployment.podLabels | indent 8 }} - spec: - {{- if .Values.stakaterclouddocs.deployment.tolerations }} - tolerations: -{{ toYaml .Values.stakaterclouddocs.deployment.tolerations | indent 8 -}} - {{- end }} - imagePullSecrets: - - name: {{ .Values.stakaterclouddocs.deployment.imagePullSecrets }} - containers: - - name: {{ .Values.stakaterclouddocs.deployment.containerName }} - image: "{{ .Values.stakaterclouddocs.deployment.image.name }}:{{ .Values.stakaterclouddocs.deployment.image.tag }}" - ports: - - containerPort: 8080 \ No newline at end of file diff --git a/deployments/kubernetes/chart/StakaterCloudDocs/templates/service.yaml b/deployments/kubernetes/chart/StakaterCloudDocs/templates/service.yaml deleted file mode 100644 index 22db466e..00000000 --- a/deployments/kubernetes/chart/StakaterCloudDocs/templates/service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - labels: -{{ include "stakater-cloud-docs.labels.stakater" . | indent 4 }} -{{ include "stakater-cloud-docs.labels.chart" . | indent 4 }} - expose: {{ .Values.stakaterclouddocs.service.labels.expose | quote }} - name: {{ .Values.stakaterclouddocs.service.name | quote }} -{{ if .Values.stakaterclouddocs.service.annotations }} - annotations: -{{ toYaml .Values.stakaterclouddocs.service.annotations | indent 4 }} -{{ end }} -spec: - selector: -{{ toYaml .Values.stakaterclouddocs.deployment.podLabels | indent 4 }} - ports: - - name: web - port: 8080 - protocol: TCP - targetPort: 8080 diff --git a/deployments/kubernetes/chart/StakaterCloudDocs/values.yaml b/deployments/kubernetes/chart/StakaterCloudDocs/values.yaml deleted file mode 100644 index 4e0fdde7..00000000 --- a/deployments/kubernetes/chart/StakaterCloudDocs/values.yaml +++ /dev/null @@ -1,37 +0,0 @@ -stakaterclouddocs: - labels: - group: com.stakater.platform - provider: stakater - version: 1.0.0 - service: - name: "stakaterclouddocs" - annotations: - xposer.stakater.com/annotations: |- - kubernetes.io/ingress.class: external-ingress - ingress.kubernetes.io/force-ssl-redirect: true - certmanager.k8s.io/cluster-issuer: letsencrypt-production - forecastle.stakater.com/appName: stakater-cloud-docs - forecastle.stakater.com/expose: true - forecastle.stakater.com/icon: https://raw.githubusercontent.com/stakater/ForecastleIcons/master/book.png - monitor.stakater.com/enabled: true - config.xposer.stakater.com/IngressURLTemplate: "{{ `{{.Service}}-{{.Namespace}}.{{.Domain}}` }}" - config.xposer.stakater.com/Domain: stakater.com - config.xposer.stakater.com/TLS: "true" - labels: - expose: 'true' - deployment: - tolerations: - - key: "dedicated" - operator: "Equal" - value: "app" - effect: "NoSchedule" - replicas: 1 - podLabels: - app: stakater-cloud-docs - containerName: stakaterclouddocs - imagePullSecrets: docker-registry-secret - - image: - name: stakater/stakater-cloud-docs - tag: 1.0.0 - From cab687f0059baa6c61b490487322dcbf76f8df9a Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Wed, 29 Apr 2020 16:21:51 +0500 Subject: [PATCH 04/10] Remove templates --- .../chart/stakaterclouddocs/values.yaml | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 deployments/kubernetes/chart/stakaterclouddocs/values.yaml diff --git a/deployments/kubernetes/chart/stakaterclouddocs/values.yaml b/deployments/kubernetes/chart/stakaterclouddocs/values.yaml new file mode 100644 index 00000000..4e0fdde7 --- /dev/null +++ b/deployments/kubernetes/chart/stakaterclouddocs/values.yaml @@ -0,0 +1,37 @@ +stakaterclouddocs: + labels: + group: com.stakater.platform + provider: stakater + version: 1.0.0 + service: + name: "stakaterclouddocs" + annotations: + xposer.stakater.com/annotations: |- + kubernetes.io/ingress.class: external-ingress + ingress.kubernetes.io/force-ssl-redirect: true + certmanager.k8s.io/cluster-issuer: letsencrypt-production + forecastle.stakater.com/appName: stakater-cloud-docs + forecastle.stakater.com/expose: true + forecastle.stakater.com/icon: https://raw.githubusercontent.com/stakater/ForecastleIcons/master/book.png + monitor.stakater.com/enabled: true + config.xposer.stakater.com/IngressURLTemplate: "{{ `{{.Service}}-{{.Namespace}}.{{.Domain}}` }}" + config.xposer.stakater.com/Domain: stakater.com + config.xposer.stakater.com/TLS: "true" + labels: + expose: 'true' + deployment: + tolerations: + - key: "dedicated" + operator: "Equal" + value: "app" + effect: "NoSchedule" + replicas: 1 + podLabels: + app: stakater-cloud-docs + containerName: stakaterclouddocs + imagePullSecrets: docker-registry-secret + + image: + name: stakater/stakater-cloud-docs + tag: 1.0.0 + From 3e4e729cf36aa2261a3ebb5e9e1a1fdc9e0772ee Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Wed, 29 Apr 2020 16:22:01 +0500 Subject: [PATCH 05/10] Remove templates --- .../chart/stakaterclouddocs/Chart.yaml | 12 ++++++++ .../stakaterclouddocs/templates/_helpers.tpl | 24 +++++++++++++++ .../templates/deployment.yaml | 29 +++++++++++++++++++ .../stakaterclouddocs/templates/service.yaml | 20 +++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 deployments/kubernetes/chart/stakaterclouddocs/Chart.yaml create mode 100644 deployments/kubernetes/chart/stakaterclouddocs/templates/_helpers.tpl create mode 100644 deployments/kubernetes/chart/stakaterclouddocs/templates/deployment.yaml create mode 100644 deployments/kubernetes/chart/stakaterclouddocs/templates/service.yaml diff --git a/deployments/kubernetes/chart/stakaterclouddocs/Chart.yaml b/deployments/kubernetes/chart/stakaterclouddocs/Chart.yaml new file mode 100644 index 00000000..6cfc16d2 --- /dev/null +++ b/deployments/kubernetes/chart/stakaterclouddocs/Chart.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +name: stakater-cloud-docs +description: Stakater Cloud Documentation +version: 1.0.0 +keywords: + - stakater + - cloud + - openshift +home: https://github.com/stakater/stakaterclouddocs +maintainers: +- name: Stakater + email: hello@stakater.com diff --git a/deployments/kubernetes/chart/stakaterclouddocs/templates/_helpers.tpl b/deployments/kubernetes/chart/stakaterclouddocs/templates/_helpers.tpl new file mode 100644 index 00000000..395cf62e --- /dev/null +++ b/deployments/kubernetes/chart/stakaterclouddocs/templates/_helpers.tpl @@ -0,0 +1,24 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "stakater-cloud-docs.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "stakater-cloud-docs.labels.selector" -}} +app: {{ template "stakater-cloud-docs.name" . }} +group: {{ .Values.stakaterclouddocs.labels.group }} +provider: {{ .Values.stakaterclouddocs.labels.provider }} +{{- end -}} + +{{- define "stakater-cloud-docs.labels.stakater" -}} +{{ template "stakater-cloud-docs.labels.selector" . }} +version: "{{ .Values.stakaterclouddocs.labels.version }}" +{{- end -}} + +{{- define "stakater-cloud-docs.labels.chart" -}} +chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" +release: {{ .Release.Name | quote }} +heritage: {{ .Release.Service | quote }} +{{- end -}} diff --git a/deployments/kubernetes/chart/stakaterclouddocs/templates/deployment.yaml b/deployments/kubernetes/chart/stakaterclouddocs/templates/deployment.yaml new file mode 100644 index 00000000..a44bc661 --- /dev/null +++ b/deployments/kubernetes/chart/stakaterclouddocs/templates/deployment.yaml @@ -0,0 +1,29 @@ +apiVersion: apps/v1beta1 +kind: Deployment +metadata: + labels: +{{ include "stakater-cloud-docs.labels.stakater" . | indent 4 }} +{{ include "stakater-cloud-docs.labels.chart" . | indent 4 }} + name: {{ template "stakater-cloud-docs.name" . }} +{{ if .Values.stakaterclouddocs.deployment.annotations }} + annotations: +{{ toYaml .Values.stakaterclouddocs.deployment.annotations | indent 4 }} +{{ end }} +spec: + replicas: {{ .Values.stakaterclouddocs.deployment.replicas }} + template: + metadata: + labels: +{{ toYaml .Values.stakaterclouddocs.deployment.podLabels | indent 8 }} + spec: + {{- if .Values.stakaterclouddocs.deployment.tolerations }} + tolerations: +{{ toYaml .Values.stakaterclouddocs.deployment.tolerations | indent 8 -}} + {{- end }} + imagePullSecrets: + - name: {{ .Values.stakaterclouddocs.deployment.imagePullSecrets }} + containers: + - name: {{ .Values.stakaterclouddocs.deployment.containerName }} + image: "{{ .Values.stakaterclouddocs.deployment.image.name }}:{{ .Values.stakaterclouddocs.deployment.image.tag }}" + ports: + - containerPort: 8080 \ No newline at end of file diff --git a/deployments/kubernetes/chart/stakaterclouddocs/templates/service.yaml b/deployments/kubernetes/chart/stakaterclouddocs/templates/service.yaml new file mode 100644 index 00000000..22db466e --- /dev/null +++ b/deployments/kubernetes/chart/stakaterclouddocs/templates/service.yaml @@ -0,0 +1,20 @@ +kind: Service +apiVersion: v1 +metadata: + labels: +{{ include "stakater-cloud-docs.labels.stakater" . | indent 4 }} +{{ include "stakater-cloud-docs.labels.chart" . | indent 4 }} + expose: {{ .Values.stakaterclouddocs.service.labels.expose | quote }} + name: {{ .Values.stakaterclouddocs.service.name | quote }} +{{ if .Values.stakaterclouddocs.service.annotations }} + annotations: +{{ toYaml .Values.stakaterclouddocs.service.annotations | indent 4 }} +{{ end }} +spec: + selector: +{{ toYaml .Values.stakaterclouddocs.deployment.podLabels | indent 4 }} + ports: + - name: web + port: 8080 + protocol: TCP + targetPort: 8080 From 504e0d0730210040e21c91930b3258f1ce85950e Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Wed, 29 Apr 2020 16:34:56 +0500 Subject: [PATCH 06/10] Update pipeline library version, update service name --- Jenkinsfile | 2 +- deployments/kubernetes/chart/stakaterclouddocs/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 652ea25a..f4feb196 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -@Library('github.com/stakater/stakater-pipeline-library@v2.16.22') _ +@Library('github.com/stakater/stakater-pipeline-library@v2.16.27') _ appWithDockerfileBuildRelease { dockerRepositoryURL = 'docker-delivery.stakater.com:443' diff --git a/deployments/kubernetes/chart/stakaterclouddocs/values.yaml b/deployments/kubernetes/chart/stakaterclouddocs/values.yaml index 4e0fdde7..538809e4 100644 --- a/deployments/kubernetes/chart/stakaterclouddocs/values.yaml +++ b/deployments/kubernetes/chart/stakaterclouddocs/values.yaml @@ -4,7 +4,7 @@ stakaterclouddocs: provider: stakater version: 1.0.0 service: - name: "stakaterclouddocs" + name: "cloud-docs" annotations: xposer.stakater.com/annotations: |- kubernetes.io/ingress.class: external-ingress From 0d286cb339a6c499c9ede98eb711273d5d16f1af Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Wed, 29 Apr 2020 16:42:38 +0500 Subject: [PATCH 07/10] Update service name --- deployments/kubernetes/chart/stakaterclouddocs/values.yaml | 3 ++- deployments/kubernetes/templates/chart/values.yaml.tmpl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deployments/kubernetes/chart/stakaterclouddocs/values.yaml b/deployments/kubernetes/chart/stakaterclouddocs/values.yaml index 538809e4..6b1a0b36 100644 --- a/deployments/kubernetes/chart/stakaterclouddocs/values.yaml +++ b/deployments/kubernetes/chart/stakaterclouddocs/values.yaml @@ -14,9 +14,10 @@ stakaterclouddocs: forecastle.stakater.com/expose: true forecastle.stakater.com/icon: https://raw.githubusercontent.com/stakater/ForecastleIcons/master/book.png monitor.stakater.com/enabled: true - config.xposer.stakater.com/IngressURLTemplate: "{{ `{{.Service}}-{{.Namespace}}.{{.Domain}}` }}" + config.xposer.stakater.com/IngressURLTemplate: "{{ `{{.Service}}.{{.Domain}}` }}" config.xposer.stakater.com/Domain: stakater.com config.xposer.stakater.com/TLS: "true" + config.xposer.stakater.com/IngressNameTemplate: "{{ `{{.Service}}-{{.Namespace}}` }}" labels: expose: 'true' deployment: diff --git a/deployments/kubernetes/templates/chart/values.yaml.tmpl b/deployments/kubernetes/templates/chart/values.yaml.tmpl index b830db78..b6b5f755 100644 --- a/deployments/kubernetes/templates/chart/values.yaml.tmpl +++ b/deployments/kubernetes/templates/chart/values.yaml.tmpl @@ -7,7 +7,7 @@ stakaterclouddocs: provider: stakater version: {{ getenv "VERSION" }} service: - name: "stakaterclouddocs" + name: "cloud-docs" annotations: xposer.stakater.com/annotations: |- kubernetes.io/ingress.class: external-ingress From 9491562c01b8302a93e97a476c561312c359e51e Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Wed, 29 Apr 2020 16:43:45 +0500 Subject: [PATCH 08/10] Update landing page --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 97d50254..eb55cd7a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ -# Stakater Cloud Docs -Stakater Cloud Documentation +# Stakater Cloud Documentation + +Detailed walkthrough of stakater cloud offering From fbe6d3a0ca53192410481c8b6d2d52190c09d888 Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Wed, 29 Apr 2020 16:46:17 +0500 Subject: [PATCH 09/10] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4863f46e..27bfa1af 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "docs", "version": "0.0.1", - "private": true, + "private": false, "description": "Stakater Cloud Documentation", "keywords": [ "documentation", @@ -24,6 +24,7 @@ "gray-matter": "^4.0.2", "http-server": "^0.12.3", "js-yaml": "^3.13.1", + "minimist": "^1.2.2", "lodash": "^4.17.15", "lodash.template": "^4.5.0", "svgo": "^1.3.2", From 2f944869301f8ccc01a04babd13ad97a7ec7a830 Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Wed, 29 Apr 2020 16:57:06 +0500 Subject: [PATCH 10/10] Update service name --- deployments/kubernetes/chart/stakaterclouddocs/values.yaml | 3 +-- deployments/kubernetes/templates/chart/values.yaml.tmpl | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/deployments/kubernetes/chart/stakaterclouddocs/values.yaml b/deployments/kubernetes/chart/stakaterclouddocs/values.yaml index 6b1a0b36..47b68698 100644 --- a/deployments/kubernetes/chart/stakaterclouddocs/values.yaml +++ b/deployments/kubernetes/chart/stakaterclouddocs/values.yaml @@ -4,7 +4,7 @@ stakaterclouddocs: provider: stakater version: 1.0.0 service: - name: "cloud-docs" + name: "stakaterclouddocs" annotations: xposer.stakater.com/annotations: |- kubernetes.io/ingress.class: external-ingress @@ -17,7 +17,6 @@ stakaterclouddocs: config.xposer.stakater.com/IngressURLTemplate: "{{ `{{.Service}}.{{.Domain}}` }}" config.xposer.stakater.com/Domain: stakater.com config.xposer.stakater.com/TLS: "true" - config.xposer.stakater.com/IngressNameTemplate: "{{ `{{.Service}}-{{.Namespace}}` }}" labels: expose: 'true' deployment: diff --git a/deployments/kubernetes/templates/chart/values.yaml.tmpl b/deployments/kubernetes/templates/chart/values.yaml.tmpl index b6b5f755..b830db78 100644 --- a/deployments/kubernetes/templates/chart/values.yaml.tmpl +++ b/deployments/kubernetes/templates/chart/values.yaml.tmpl @@ -7,7 +7,7 @@ stakaterclouddocs: provider: stakater version: {{ getenv "VERSION" }} service: - name: "cloud-docs" + name: "stakaterclouddocs" annotations: xposer.stakater.com/annotations: |- kubernetes.io/ingress.class: external-ingress