diff --git a/enviroments/providers.tf b/enviroments/providers.tf deleted file mode 100644 index 031403a..0000000 --- a/enviroments/providers.tf +++ /dev/null @@ -1,7 +0,0 @@ -terraform { - required_providers { - kind = { - source = "hashicorp/kind" - } - } -} diff --git a/enviroments/local-dev/.terraform.lock.hcl b/environments/local-dev/.terraform.lock.hcl similarity index 100% rename from enviroments/local-dev/.terraform.lock.hcl rename to environments/local-dev/.terraform.lock.hcl diff --git a/enviroments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/CHANGELOG.md b/environments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/CHANGELOG.md similarity index 100% rename from enviroments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/CHANGELOG.md rename to environments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/CHANGELOG.md diff --git a/enviroments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/LICENSE b/environments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/LICENSE similarity index 100% rename from enviroments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/LICENSE rename to environments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/LICENSE diff --git a/enviroments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/README.md b/environments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/README.md similarity index 100% rename from enviroments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/README.md rename to environments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/README.md diff --git a/enviroments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/terraform-provider-null b/environments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/terraform-provider-null similarity index 100% rename from enviroments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/terraform-provider-null rename to environments/local-dev/.terraform/providers/registry.opentofu.org/hashicorp/null/3.2.2/linux_amd64/terraform-provider-null diff --git a/enviroments/local-dev/deployment-test.yaml b/environments/local-dev/deployment-test.yaml similarity index 100% rename from enviroments/local-dev/deployment-test.yaml rename to environments/local-dev/deployment-test.yaml diff --git a/enviroments/local-dev/kind-cluster.sh b/environments/local-dev/kind-cluster.sh similarity index 100% rename from enviroments/local-dev/kind-cluster.sh rename to environments/local-dev/kind-cluster.sh diff --git a/enviroments/local-dev/kind-config.yaml b/environments/local-dev/kind-config.yaml similarity index 100% rename from enviroments/local-dev/kind-config.yaml rename to environments/local-dev/kind-config.yaml diff --git a/enviroments/local-dev/main.tf b/environments/local-dev/main.tf similarity index 100% rename from enviroments/local-dev/main.tf rename to environments/local-dev/main.tf diff --git a/enviroments/local-dev/terraform.tfstate.backup b/environments/local-dev/terraform.tfstate similarity index 57% rename from enviroments/local-dev/terraform.tfstate.backup rename to environments/local-dev/terraform.tfstate index fdd45a2..f07d0c8 100644 --- a/enviroments/local-dev/terraform.tfstate.backup +++ b/environments/local-dev/terraform.tfstate @@ -1 +1 @@ -{"version":4,"terraform_version":"1.8.1","serial":11,"lineage":"8322b547-5f83-207b-588b-6ecb94034a8d","outputs":{},"resources":[],"check_results":null} +{"version":4,"terraform_version":"1.8.1","serial":15,"lineage":"8322b547-5f83-207b-588b-6ecb94034a8d","outputs":{},"resources":[],"check_results":null} diff --git a/enviroments/local-dev/terraform.tfstate b/environments/local-dev/terraform.tfstate.backup similarity index 61% rename from enviroments/local-dev/terraform.tfstate rename to environments/local-dev/terraform.tfstate.backup index b18db17..7567231 100644 --- a/enviroments/local-dev/terraform.tfstate +++ b/environments/local-dev/terraform.tfstate.backup @@ -1 +1 @@ -{"version":4,"terraform_version":"1.8.1","serial":12,"lineage":"8322b547-5f83-207b-588b-6ecb94034a8d","outputs":{"kubeconfig_path":{"value":"./kubeconfig_example","type":"string"}},"resources":[{"mode":"managed","type":"null_resource","name":"kind_cluster","provider":"provider[\"registry.opentofu.org/hashicorp/null\"]","instances":[{"schema_version":0,"attributes":{"id":"3888125863364646145","triggers":{"always_run":"2024-08-21T12:32:42Z"}},"sensitive_attributes":[]}]}],"check_results":null} +{"version":4,"terraform_version":"1.8.1","serial":14,"lineage":"8322b547-5f83-207b-588b-6ecb94034a8d","outputs":{"kubeconfig_path":{"value":"./kubeconfig_example","type":"string"}},"resources":[{"mode":"managed","type":"null_resource","name":"kind_cluster","provider":"provider[\"registry.opentofu.org/hashicorp/null\"]","instances":[{"schema_version":0,"attributes":{"id":"2724881006231483995","triggers":{"always_run":"2024-08-21T14:52:01Z"}},"sensitive_attributes":[]}]}],"check_results":null} diff --git a/helm-charts/go-web-server/Chart.yaml b/helm-charts/go-web-server/Chart.yaml new file mode 100644 index 0000000..47823c9 --- /dev/null +++ b/helm-charts/go-web-server/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: go-simple-web-server +description: A Helm chart for deploying a go web app server from a private container registry + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: "1.0" + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.0" diff --git a/helm-charts/go-web-server/templates/NOTES.txt b/helm-charts/go-web-server/templates/NOTES.txt new file mode 100644 index 0000000..8e6a225 --- /dev/null +++ b/helm-charts/go-web-server/templates/NOTES.txt @@ -0,0 +1,26 @@ +Get your application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "go-simple-web-server.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "go-simple-web-server.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "go-simple-web-server.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + +1.export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "go-simple-web-server.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + +2.export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + +3.kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT + +4.You can Now "Visit http://127.0.0.1:8080 to use your application" and use /metrics path to see the metrics exposed by the application. +{{- end }} diff --git a/helm-charts/go-web-server/templates/_helpers.tpl b/helm-charts/go-web-server/templates/_helpers.tpl new file mode 100644 index 0000000..9f22326 --- /dev/null +++ b/helm-charts/go-web-server/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "go-simple-web-server.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "go-simple-web-server.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "go-simple-web-server.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "go-simple-web-server.labels" -}} +helm.sh/chart: {{ include "go-simple-web-server.chart" . }} +{{ include "go-simple-web-server.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "go-simple-web-server.selectorLabels" -}} +app.kubernetes.io/name: {{ include "go-simple-web-server.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "go-simple-web-server.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "go-simple-web-server.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/helm-charts/go-web-server/templates/deployment.yaml b/helm-charts/go-web-server/templates/deployment.yaml new file mode 100644 index 0000000..becdcc6 --- /dev/null +++ b/helm-charts/go-web-server/templates/deployment.yaml @@ -0,0 +1,61 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "go-simple-web-server.fullname" . }} + labels: + {{- include "go-simple-web-server.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "go-simple-web-server.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "go-simple-web-server.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "go-simple-web-server.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: 8080 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: / + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/helm-charts/go-web-server/templates/hpa.yaml b/helm-charts/go-web-server/templates/hpa.yaml new file mode 100644 index 0000000..57c1b19 --- /dev/null +++ b/helm-charts/go-web-server/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "go-simple-web-server.fullname" . }} + labels: + {{- include "go-simple-web-server.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "go-simple-web-server.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/helm-charts/go-web-server/templates/ingress.yaml b/helm-charts/go-web-server/templates/ingress.yaml new file mode 100644 index 0000000..626002f --- /dev/null +++ b/helm-charts/go-web-server/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "go-simple-web-server.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "go-simple-web-server.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/helm-charts/go-web-server/templates/service.yaml b/helm-charts/go-web-server/templates/service.yaml new file mode 100644 index 0000000..962edb8 --- /dev/null +++ b/helm-charts/go-web-server/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "go-simple-web-server.fullname" . }} + labels: + {{- include "go-simple-web-server.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "go-simple-web-server.selectorLabels" . | nindent 4 }} diff --git a/helm-charts/go-web-server/templates/serviceaccount.yaml b/helm-charts/go-web-server/templates/serviceaccount.yaml new file mode 100644 index 0000000..482c87e --- /dev/null +++ b/helm-charts/go-web-server/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "go-simple-web-server.serviceAccountName" . }} + labels: + {{- include "go-simple-web-server.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/helm-charts/go-web-server/templates/tests/test-connection.yaml b/helm-charts/go-web-server/templates/tests/test-connection.yaml new file mode 100644 index 0000000..ce96d48 --- /dev/null +++ b/helm-charts/go-web-server/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "go-simple-web-server.fullname" . }}-test-connection" + labels: + {{- include "go-simple-web-server.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "go-simple-web-server.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/helm-charts/go-web-server/values.yaml b/helm-charts/go-web-server/values.yaml new file mode 100644 index 0000000..b13d8ba --- /dev/null +++ b/helm-charts/go-web-server/values.yaml @@ -0,0 +1,83 @@ +# Default values for go-simple-web-server. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: tincher/go-hello-world + pullPolicy: Always + # Overrides the image tag whose default is the chart appVersion. + tag: "latest" + +imagePullSecrets: + - name: my-registry-secret +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 8080 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/index.yaml b/index.yaml new file mode 100644 index 0000000..f393fa2 --- /dev/null +++ b/index.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +entries: + go-simple-web-server: + - apiVersion: v2 + appVersion: "1.0" + created: "2024-08-21T17:33:25.345527611+01:00" + description: A Helm chart for deploying a go web app server from a private container + registry + digest: b4bf5193f013ddf4f34a1912faeb5357a0d6b2dfbf24ad7e897d940e0d50c6b6 + name: go-simple-web-server + type: application + urls: + - https://cherrymu.github.io/process-out-challenge/go-simple-web-server-1.0.tgz + version: "1.0" +generated: "2024-08-21T17:33:25.345181047+01:00"