From 0e41985ee0fbe35b5fc119b7c71c97d5b3b4ee11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=BB=20Eher?= Date: Thu, 27 Jan 2022 14:47:11 -0300 Subject: [PATCH 1/4] $ helm create kubephp (PWD: ./charts) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Beep Boop! Signed-off-by: 💻 Eher --- charts/kubephp/.helmignore | 23 ++++++ charts/kubephp/Chart.yaml | 24 ++++++ charts/kubephp/templates/NOTES.txt | 22 +++++ charts/kubephp/templates/_helpers.tpl | 62 ++++++++++++++ charts/kubephp/templates/deployment.yaml | 61 ++++++++++++++ charts/kubephp/templates/hpa.yaml | 28 +++++++ charts/kubephp/templates/ingress.yaml | 61 ++++++++++++++ charts/kubephp/templates/service.yaml | 15 ++++ charts/kubephp/templates/serviceaccount.yaml | 12 +++ .../templates/tests/test-connection.yaml | 15 ++++ charts/kubephp/values.yaml | 82 +++++++++++++++++++ 11 files changed, 405 insertions(+) create mode 100644 charts/kubephp/.helmignore create mode 100644 charts/kubephp/Chart.yaml create mode 100644 charts/kubephp/templates/NOTES.txt create mode 100644 charts/kubephp/templates/_helpers.tpl create mode 100644 charts/kubephp/templates/deployment.yaml create mode 100644 charts/kubephp/templates/hpa.yaml create mode 100644 charts/kubephp/templates/ingress.yaml create mode 100644 charts/kubephp/templates/service.yaml create mode 100644 charts/kubephp/templates/serviceaccount.yaml create mode 100644 charts/kubephp/templates/tests/test-connection.yaml create mode 100644 charts/kubephp/values.yaml diff --git a/charts/kubephp/.helmignore b/charts/kubephp/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/charts/kubephp/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/kubephp/Chart.yaml b/charts/kubephp/Chart.yaml new file mode 100644 index 0000000..a56be24 --- /dev/null +++ b/charts/kubephp/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: kubephp +description: A Helm chart for Kubernetes created using kubephp + +# 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: 0.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.16.0" diff --git a/charts/kubephp/templates/NOTES.txt b/charts/kubephp/templates/NOTES.txt new file mode 100644 index 0000000..d625f13 --- /dev/null +++ b/charts/kubephp/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the 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 "kubephp.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 "kubephp.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "kubephp.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "kubephp.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/charts/kubephp/templates/_helpers.tpl b/charts/kubephp/templates/_helpers.tpl new file mode 100644 index 0000000..ed3043b --- /dev/null +++ b/charts/kubephp/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "kubephp.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 "kubephp.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 "kubephp.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "kubephp.labels" -}} +helm.sh/chart: {{ include "kubephp.chart" . }} +{{ include "kubephp.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "kubephp.selectorLabels" -}} +app.kubernetes.io/name: {{ include "kubephp.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "kubephp.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "kubephp.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/kubephp/templates/deployment.yaml b/charts/kubephp/templates/deployment.yaml new file mode 100644 index 0000000..6f13f9d --- /dev/null +++ b/charts/kubephp/templates/deployment.yaml @@ -0,0 +1,61 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "kubephp.fullname" . }} + labels: + {{- include "kubephp.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "kubephp.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "kubephp.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "kubephp.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: 80 + 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/charts/kubephp/templates/hpa.yaml b/charts/kubephp/templates/hpa.yaml new file mode 100644 index 0000000..b11c6bc --- /dev/null +++ b/charts/kubephp/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "kubephp.fullname" . }} + labels: + {{- include "kubephp.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "kubephp.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/charts/kubephp/templates/ingress.yaml b/charts/kubephp/templates/ingress.yaml new file mode 100644 index 0000000..c2dd07e --- /dev/null +++ b/charts/kubephp/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "kubephp.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 "kubephp.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/charts/kubephp/templates/service.yaml b/charts/kubephp/templates/service.yaml new file mode 100644 index 0000000..86a416b --- /dev/null +++ b/charts/kubephp/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "kubephp.fullname" . }} + labels: + {{- include "kubephp.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "kubephp.selectorLabels" . | nindent 4 }} diff --git a/charts/kubephp/templates/serviceaccount.yaml b/charts/kubephp/templates/serviceaccount.yaml new file mode 100644 index 0000000..f9d0122 --- /dev/null +++ b/charts/kubephp/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "kubephp.serviceAccountName" . }} + labels: + {{- include "kubephp.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/kubephp/templates/tests/test-connection.yaml b/charts/kubephp/templates/tests/test-connection.yaml new file mode 100644 index 0000000..6e2fa95 --- /dev/null +++ b/charts/kubephp/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "kubephp.fullname" . }}-test-connection" + labels: + {{- include "kubephp.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "kubephp.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/charts/kubephp/values.yaml b/charts/kubephp/values.yaml new file mode 100644 index 0000000..264909f --- /dev/null +++ b/charts/kubephp/values.yaml @@ -0,0 +1,82 @@ +# Default values for kubephp. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: nginx + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +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: 80 + +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: {} From 80406bbacd67cf889a9504a0494a87a502732794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=BB=20Eher?= Date: Thu, 27 Jan 2022 15:07:47 -0300 Subject: [PATCH 2/4] Use GitHub actions to release Helm chart MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use GitHub actions to turn a GitHub project into a self-hosted Helm chart repo, using helm/chart-releaser CLI tool. Signed-off-by: 💻 Eher --- .github/workflows/helm-chart-releaser.yml | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/helm-chart-releaser.yml diff --git a/.github/workflows/helm-chart-releaser.yml b/.github/workflows/helm-chart-releaser.yml new file mode 100644 index 0000000..9043f76 --- /dev/null +++ b/.github/workflows/helm-chart-releaser.yml @@ -0,0 +1,31 @@ +name: Release Charts + +on: + push: + branches: + - main + - master + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + - name: Install Helm + uses: azure/setup-helm@v1 + with: + version: v3.4.0 + + - name: Run chart-releaser + uses: helm/chart-releaser-action@v1.2.1 + env: + CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From da2b81e2f2985fc84e57753e1cc13e614c5cc82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=BB=20Eher?= Date: Sat, 29 Jan 2022 21:57:56 -0300 Subject: [PATCH 3/4] Use GitHub actions to publish container images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release the images on Github Registry based on branch and tag. Production and Dev images will be available. Signed-off-by: 💻 Eher --- .../workflows/publish-container-images.yml | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 .github/workflows/publish-container-images.yml diff --git a/.github/workflows/publish-container-images.yml b/.github/workflows/publish-container-images.yml new file mode 100644 index 0000000..33ecd5c --- /dev/null +++ b/.github/workflows/publish-container-images.yml @@ -0,0 +1,104 @@ +name: Publish Container Images + +on: + schedule: + - cron: '35 7 * * *' + push: + branches: + - main + - master + tags: ['*.*.*'] + pull_request: + branches: + - main + - master + +env: + IMAGE_NAME: ${{ github.repository }} + REGISTRY: ghcr.io + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Setup Docker buildx + uses: docker/setup-buildx-action@v1 + + - name: Log into registry ${{ env.REGISTRY }} + if: github.event_name != 'pull_request' + uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract app metadata + id: meta-app + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/app + + - name: Build and push app image + id: build-and-push-app + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + target: app + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta-app.outputs.tags }} + labels: ${{ steps.meta-app.outputs.labels }} + + - name: Extract app-dev metadata + id: meta-app-dev + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/app-dev + + - name: Build and push app image + id: build-and-push-app-dev + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + target: app-dev + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta-app-dev.outputs.tags }} + labels: ${{ steps.meta-app-dev.outputs.labels }} + + - name: Extract web metadata + id: meta-web + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/web + + - name: Build and push web image + id: build-and-push-web + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + target: web + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta-web.outputs.tags }} + labels: ${{ steps.meta-web.outputs.labels }} + + - name: Extract web-dev metadata + id: meta-web-dev + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/web-dev + + - name: Build and push web-dev image + id: build-and-push-web-dev + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + target: web-dev + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta-web-dev.outputs.tags }} + labels: ${{ steps.meta-web-dev.outputs.labels }} From 60bbea57aeb92c526e6f75bcf0b95c4c7b9ffb8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=92=BB=20Eher?= Date: Mon, 31 Jan 2022 02:33:42 -0300 Subject: [PATCH 4/4] Change Helm Chart to work with kubephp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One Pod runs both containers. It's possible to change the images on charts/kubephp/values.yaml (even use the development version). Signed-off-by: 💻 Eher --- charts/kubephp/templates/NOTES.txt | 2 +- charts/kubephp/templates/deployment.yaml | 27 ++++++++++++++++++++---- charts/kubephp/values.yaml | 18 +++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/charts/kubephp/templates/NOTES.txt b/charts/kubephp/templates/NOTES.txt index d625f13..bf6f7e6 100644 --- a/charts/kubephp/templates/NOTES.txt +++ b/charts/kubephp/templates/NOTES.txt @@ -16,7 +16,7 @@ echo http://$SERVICE_IP:{{ .Values.service.port }} {{- else if contains "ClusterIP" .Values.service.type }} export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "kubephp.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[1].ports[0].containerPort}") echo "Visit http://127.0.0.1:8080 to use your application" kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT {{- end }} diff --git a/charts/kubephp/templates/deployment.yaml b/charts/kubephp/templates/deployment.yaml index 6f13f9d..79de5d2 100644 --- a/charts/kubephp/templates/deployment.yaml +++ b/charts/kubephp/templates/deployment.yaml @@ -28,14 +28,33 @@ spec: securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - - name: {{ .Chart.Name }} + - name: app securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: "{{ .Values.app.image.repository }}:{{ .Values.app.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.app.image.pullPolicy }} + ports: + - name: php-fpm + containerPort: 9000 + protocol: TCP + livenessProbe: + httpGet: + path: /status + port: http + readinessProbe: + httpGet: + path: /status + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + - name: web + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.web.image.repository }}:{{ .Values.web.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.web.image.pullPolicy }} ports: - name: http - containerPort: 80 + containerPort: 8080 protocol: TCP livenessProbe: httpGet: diff --git a/charts/kubephp/values.yaml b/charts/kubephp/values.yaml index 264909f..c893f7b 100644 --- a/charts/kubephp/values.yaml +++ b/charts/kubephp/values.yaml @@ -4,11 +4,19 @@ replicaCount: 1 -image: - repository: nginx - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" +app: + image: + repository: ghcr.io/eher/miniature-octo-chainsaw/app + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "master" + +web: + image: + repository: ghcr.io/eher/miniature-octo-chainsaw/web + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "master" imagePullSecrets: [] nameOverride: ""