commit fe0ccff5e67533fd23674e997c8d64ed22668d47 Author: Jack Jackson Date: Tue Oct 25 21:42:24 2022 -0700 First commit diff --git a/README.md b/README.md new file mode 100644 index 0000000..8a43531 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +This package defines the Infrastructure components that serve the blog defined [here](https://gitea.scubbo.org/scubbo/blogContent) at [this site](https://blog.scubbo.org/). \ No newline at end of file diff --git a/helm/Chart.yaml b/helm/Chart.yaml new file mode 100644 index 0000000..b1ab004 --- /dev/null +++ b/helm/Chart.yaml @@ -0,0 +1,7 @@ +apiVersion: v2 +name: blog-infrastructure +description: The Infrastructure underlying blog.scubbo.org + +type: application +version: 0.1.0 +appVersion: "1.1.0" \ No newline at end of file diff --git a/helm/deployed-images/prod b/helm/deployed-images/prod new file mode 100644 index 0000000..c3409c5 --- /dev/null +++ b/helm/deployed-images/prod @@ -0,0 +1 @@ +43dfbf4841 \ No newline at end of file diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl new file mode 100644 index 0000000..7a07b66 --- /dev/null +++ b/helm/templates/_helpers.tpl @@ -0,0 +1,13 @@ +{{- define "imageTag" }} +{{- $val := "" }} +{{- if and (hasKey .Values.image "tag") (.Values.image.tag) }} +{{- $val = .Values.image.tag }} +{{- else }} +{{- $val = (.Files.Get (printf "%s/%s" "deployed-images" (required "You must set targetEnv if image.tag is absent!" .Values.targetEnv))) }} +{{- end }} +{{- trim $val }} +{{- end }} + +{{- define "fullImageName" -}} +{{- printf "%s:%s" .Values.image.repository (include "imageTag" .) }} +{{- end }} \ No newline at end of file diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml new file mode 100644 index 0000000..60e0a7d --- /dev/null +++ b/helm/templates/deployment.yaml @@ -0,0 +1,42 @@ +apiVersion: v1 +kind: Service +metadata: + name: blog-svc-cip + namespace: blog +spec: + ports: + - port: 8080 + protocol: TCP + targetPort: 8080 + selector: + role: app + sessionAffinity: None + type: ClusterIP +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: blog-deployment + labels: + role: app + namespace: blog +spec: + replicas: 2 + selector: + matchLabels: + role: app + template: + metadata: + labels: + role: app + spec: + containers: + # Guidance on how to set up interaction with secure registry: + # https://github.com/k3s-io/k3s/issues/1148#issuecomment-641687668 + # (Unique to rancher/k3s. On traditional k8s installs, I suspect https://github.com/kubernetes/kubernetes/issues/43924 + # is the way) + - name: app + image: {{ include "fullImageName" . }} + resources: + requests: + cpu: 10m diff --git a/helm/values.yaml b/helm/values.yaml new file mode 100644 index 0000000..b5822de --- /dev/null +++ b/helm/values.yaml @@ -0,0 +1,2 @@ +image: + repository: gitea.scubbo.org/scubbo/blog_helm \ No newline at end of file