diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml new file mode 100644 index 0000000..fb70131 --- /dev/null +++ b/.github/workflows/cicd.yml @@ -0,0 +1,18 @@ +name: cicd-workflow with slack integration +on: + push: + branches: [ "master" ] +jobs: + job1: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Build Docker image + run: | + docker build -t my-docker-repo . + - name: Run Trivy Scan + uses: aquasecurity/trivy-action@master + with: + image-ref: 'my-docker-repo:latest' + format: 'table' + severity: 'CRITICAL,HIGH' diff --git a/Dockerfile b/Dockerfile index a1402d6..7cf14e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,17 @@ -# this is my base image -FROM alpine:3.5 +# Use the official Python image from the Docker Hub with an Alpine variant +FROM python:3.9-alpine -# Install python and pip -RUN apk add --update py2-pip +# Set the working directory in the container +WORKDIR /app -# install Python modules needed by the Python app COPY requirements.txt /usr/src/app/ RUN pip install --no-cache-dir -r /usr/src/app/requirements.txt # copy files required for the app to run COPY app.py /usr/src/app/ + COPY templates/index.html /usr/src/app/templates/ -# tell the port number the container should expose EXPOSE 5000 # run the application diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 3db8a99..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,56 +0,0 @@ -pipeline { - agent any - environment { - //TODO # 1 --> once you sign up for Docker hub, use that user_id here - registry = "ananthkannan/mypython-app-may20" - //TODO #2 - update your credentials ID after creating credentials for connecting to Docker Hub - registryCredential = 'fa32f95a-2d3e-4c7b-8f34-11bcc0191d70' - dockerImage = '' - } - - stages { - stage('Cloning Git') { - steps { - checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '', url: 'https://github.com/akannan1087/myPythonDockerRepo']]]) - } - } - - // Building Docker images - stage('Building image') { - steps{ - script { - dockerImage = docker.build registry - } - } - } - - // Uploading Docker images into Docker Hub - stage('Upload Image') { - steps{ - script { - docker.withRegistry( '', registryCredential ) { - dockerImage.push() - } - } - } - } - - // Stopping Docker containers for cleaner Docker run - stage('docker stop container') { - steps { - sh 'docker ps -f name=mypythonContainer -q | xargs --no-run-if-empty docker container stop' - sh 'docker container ls -a -fname=mypythonContainer -q | xargs -r docker container rm' - } - } - - - // Running Docker container, make sure port 8096 is opened in - stage('Docker Run') { - steps{ - script { - dockerImage.run("-p 8096:5000 --rm --name mypythonContainer") - } - } - } - } -} diff --git a/app.py b/app.py index 478f1a0..d494a04 100644 --- a/app.py +++ b/app.py @@ -5,16 +5,6 @@ # list of cat images images = [ - "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr05/15/9/anigif_enhanced-buzz-26388-1381844103-11.gif", - "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr01/15/9/anigif_enhanced-buzz-31540-1381844535-8.gif", - "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr05/15/9/anigif_enhanced-buzz-26390-1381844163-18.gif", - "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr06/15/10/anigif_enhanced-buzz-1376-1381846217-0.gif", - "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr03/15/9/anigif_enhanced-buzz-3391-1381844336-26.gif", - "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr06/15/10/anigif_enhanced-buzz-29111-1381845968-0.gif", - "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr03/15/9/anigif_enhanced-buzz-3409-1381844582-13.gif", - "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr02/15/9/anigif_enhanced-buzz-19667-1381844937-10.gif", - "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr05/15/9/anigif_enhanced-buzz-26358-1381845043-13.gif", - "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr06/15/9/anigif_enhanced-buzz-18774-1381844645-6.gif", "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr06/15/9/anigif_enhanced-buzz-25158-1381844793-0.gif", "http://ak-hdl.buzzfed.com/static/2013-10/enhanced/webdr03/15/10/anigif_enhanced-buzz-11980-1381846269-1.gif" ] diff --git a/aws-ecr.yaml b/aws-ecr.yaml new file mode 100644 index 0000000..897fb3c --- /dev/null +++ b/aws-ecr.yaml @@ -0,0 +1,26 @@ +stages: +- stage: Docker + displayName: Build & Push Docker image to AWS ECR + jobs: + - job: Build_and_Push + displayName: Build & Push Docker image + pool: + vmImage: ubuntu-latest + steps: + - task: Docker@2 + displayName: Build an image + inputs: + command: build + dockerfile: '$(Build.SourcesDirectory)/Dockerfile' + buildContext: '$(Build.SourcesDirectory)' + repository: $(DOCKER_REPOSITORY_NAME) + + - task: ECRPushImage@1 + inputs: + awsCredentials: 'ecr_connection' + regionName: $(AWS_REGION) + imageSource: 'imagename' + sourceImageName: $(DOCKER_REPOSITORY_NAME) + sourceImageTag: $(Build.BuildId) + pushTag: latest + repositoryName: $(DOCKER_REPOSITORY_NAME) diff --git a/azure-aks.yaml b/azure-aks.yaml index 6541314..a78f0e1 100644 --- a/azure-aks.yaml +++ b/azure-aks.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: my-python-deployment spec: - replicas: 2 + replicas: 3 selector: matchLabels: app: my-python-app @@ -13,9 +13,8 @@ spec: app: my-python-app spec: containers: - - name: my-python-app - image: myacr3210.azurecr.io/akannan1087/mypythondockerrepo:1278 - imagePullPolicy: Always + - name: mypythondockerrepo + image: myacrrepo421.azurecr.io/akannan1087/mypythondockerrepo:#{Build.BuildId}# ports: - containerPort: 5000 # service type loadbalancer diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..0b288fe --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,68 @@ +# Docker +# Build and push an image to Azure Container Registry +# https://docs.microsoft.com/azure/devops/pipelines/languages/docker + +trigger: +- master + +resources: +- repo: self + +variables: + # Container registry service connection established during pipeline creation + dockerRegistryServiceConnection: 'd676875f-d1fb-485a-8da4-88d6bfb04604' + imageRepository: 'mypythondockerrepo' + containerRegistry: 'myacrrep31.azurecr.io' + dockerfilePath: '$(Build.SourcesDirectory)/Dockerfile' + tag: '$(Build.BuildId)' + + vmImageName: 'ubuntu-latest' + +stages: +- stage: Build + displayName: Build and push stage + jobs: + - job: Build + displayName: Build + pool: + vmImage: $(vmImageName) + steps: + - task: Docker@2 + displayName: Build Docker image + inputs: + command: build + repository: $(imageRepository) + dockerfile: $(dockerfilePath) + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + # Install Trivy Scanner on Agent + - task: Bash@3 + displayName: "Install Trivy" + inputs: + targetType: inline + script: | + curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh + # Run Trivy Scan + - task: Bash@3 + displayName: "Run Trivy Scan" + inputs: + targetType: inline + script: | + ./bin/trivy image --severity HIGH,CRITICAL,MEDIUM --ignore-unfixed $(containerRegistry)/$(imageRepository):$(tag) + - task: Docker@2 + displayName: push Docker image to container registry + inputs: + command: push + repository: $(imageRepository) + dockerfile: $(dockerfilePath) + containerRegistry: $(dockerRegistryServiceConnection) + tags: | + $(tag) + #Publish Build Information + - task: Bash@3 + displayName: "Log Image Details" + inputs: + targetType: inline + script: | + echo "Pushed Image: $(containerRegistry)/$(imageRepository):$(tag)" \ No newline at end of file diff --git a/azure-vote.yaml b/azure-vote.yaml deleted file mode 100644 index ee74bcf..0000000 --- a/azure-vote.yaml +++ /dev/null @@ -1,85 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: azure-vote-back -spec: - replicas: 1 - selector: - matchLabels: - app: azure-vote-back - template: - metadata: - labels: - app: azure-vote-back - spec: - nodeSelector: - "beta.kubernetes.io/os": linux - containers: - - name: azure-vote-back - image: mcr.microsoft.com/oss/bitnami/redis:6.0.8 - env: - - name: ALLOW_EMPTY_PASSWORD - value: "yes" - resources: - requests: - cpu: 100m - memory: 128Mi - limits: - cpu: 250m - memory: 256Mi - ports: - - containerPort: 6379 - name: redis ---- -apiVersion: v1 -kind: Service -metadata: - name: azure-vote-back -spec: - ports: - - port: 6379 - selector: - app: azure-vote-back ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: azure-vote-front -spec: - replicas: 1 - selector: - matchLabels: - app: azure-vote-front - template: - metadata: - labels: - app: azure-vote-front - spec: - nodeSelector: - "beta.kubernetes.io/os": linux - containers: - - name: azure-vote-front - image: mcr.microsoft.com/azuredocs/azure-vote-front:v1 - resources: - requests: - cpu: 100m - memory: 128Mi - limits: - cpu: 250m - memory: 256Mi - ports: - - containerPort: 80 - env: - - name: REDIS - value: "azure-vote-back" ---- -apiVersion: v1 -kind: Service -metadata: - name: azure-vote-front -spec: - type: LoadBalancer - ports: - - port: 80 - selector: - app: azure-vote-front diff --git a/eks-deploy-from-ecr.yaml b/eks-deploy-from-ecr.yaml index 7c4b0b8..e1572df 100644 --- a/eks-deploy-from-ecr.yaml +++ b/eks-deploy-from-ecr.yaml @@ -2,8 +2,9 @@ apiVersion: apps/v1 kind: Deployment metadata: name: my-python-app-deployment + namespace: python-app-ns # Namespace where the deployment will be created spec: - replicas: 2 + replicas: 3 selector: matchLabels: app: python-app @@ -14,7 +15,7 @@ spec: spec: containers: - name: my-python-app - image: 211223789150.dkr.ecr.us-east-2.amazonaws.com/my-docker-repo + image: 211223789150.dkr.ecr.us-east-1.amazonaws.com/devopscoach/my-python-repo:${BUILD_NUMBER} imagePullPolicy: Always ports: - containerPort: 5000 @@ -24,11 +25,12 @@ apiVersion: v1 kind: Service metadata: name: python-app-svc + namespace: python-app-ns # Namespace where the deployment will be created spec: selector: app: python-app ports: - protocol: TCP - port: 5000 + port: 80 targetPort: 5000 - type: LoadBalancer + type: ClusterIP diff --git a/eks-deploy.yaml b/eks-deploy.yaml deleted file mode 100644 index 3a4acd2..0000000 --- a/eks-deploy.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: my-php-deployment - namespace: jenkins-k8s-deploy -spec: - replicas: 2 - selector: - matchLabels: - app: php-app - template: - metadata: - labels: - app: php-app - spec: - containers: - - name: my-php-app - image: ananthkannan/mypython-app-may20 - imagePullPolicy: Always - ports: - - containerPort: 5000 -# service type loadbalancer ---- -apiVersion: v1 -kind: Service -metadata: - name: php-app-svc - namespace: jenkins-k8s-deploy -spec: - selector: - app: php-app - ports: - - protocol: TCP - port: 5000 - targetPort: 5000 - type: LoadBalancer diff --git a/ingress.yaml b/ingress.yaml new file mode 100644 index 0000000..152119e --- /dev/null +++ b/ingress.yaml @@ -0,0 +1,19 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: my-app-ingress + namespace: python-app-ns # Namespace where the deployment will be created + annotations: + nginx.ingress.kubernetes.io/rewrite-target: / +spec: + ingressClassName: nginx + rules: + - http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: python-app-svc + port: + number: 80 diff --git a/k8s-deployment.yaml b/k8s-deployment.yaml index a10b74a..35c85f5 100644 --- a/k8s-deployment.yaml +++ b/k8s-deployment.yaml @@ -1,7 +1,8 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: my-python-deployment + name: my-python-app-deployment + namespace: python-app-ns # Namespace where the deployment will be created spec: replicas: 3 selector: @@ -14,7 +15,7 @@ spec: spec: containers: - name: my-python-app - image: akdevopscoaching/python-app123 + image: 211223789150.dkr.ecr.us-east-1.amazonaws.com/coachak/my-docker-repo:${BUILD_NUMBER} imagePullPolicy: Always ports: - containerPort: 5000 @@ -24,11 +25,12 @@ apiVersion: v1 kind: Service metadata: name: python-app-svc + namespace: python-app-ns # Namespace where the deployment will be created spec: selector: app: python-app ports: - protocol: TCP - port: 5000 + port: 80 targetPort: 5000 - type: LoadBalancer + type: ClusterIP diff --git a/mychart/.helmignore b/mychart/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/mychart/.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/mychart/Chart.yaml b/mychart/Chart.yaml new file mode 100644 index 0000000..1000eb6 --- /dev/null +++ b/mychart/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: mychart +description: A Helm chart for Kubernetes + +# 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/mychart/templates/NOTES.txt b/mychart/templates/NOTES.txt new file mode 100644 index 0000000..13a7e1b --- /dev/null +++ b/mychart/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 "mychart.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 "mychart.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "mychart.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 "mychart.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/mychart/templates/_helpers.tpl b/mychart/templates/_helpers.tpl new file mode 100644 index 0000000..ce8a516 --- /dev/null +++ b/mychart/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "mychart.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 "mychart.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 "mychart.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "mychart.labels" -}} +helm.sh/chart: {{ include "mychart.chart" . }} +{{ include "mychart.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "mychart.selectorLabels" -}} +app.kubernetes.io/name: {{ include "mychart.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "mychart.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "mychart.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/mychart/templates/deployment.yaml b/mychart/templates/deployment.yaml new file mode 100644 index 0000000..6c13bc6 --- /dev/null +++ b/mychart/templates/deployment.yaml @@ -0,0 +1,61 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "mychart.fullname" . }} + labels: + {{- include "mychart.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "mychart.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "mychart.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "mychart.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: {{ .Values.service.port }} + 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/mychart/templates/hpa.yaml b/mychart/templates/hpa.yaml new file mode 100644 index 0000000..9749e95 --- /dev/null +++ b/mychart/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "mychart.fullname" . }} + labels: + {{- include "mychart.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "mychart.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/mychart/templates/ingress.yaml b/mychart/templates/ingress.yaml new file mode 100644 index 0000000..eb508b6 --- /dev/null +++ b/mychart/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "mychart.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 "mychart.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/mychart/templates/service.yaml b/mychart/templates/service.yaml new file mode 100644 index 0000000..bdceb88 --- /dev/null +++ b/mychart/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "mychart.fullname" . }} + labels: + {{- include "mychart.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "mychart.selectorLabels" . | nindent 4 }} diff --git a/mychart/templates/serviceaccount.yaml b/mychart/templates/serviceaccount.yaml new file mode 100644 index 0000000..0a0dd82 --- /dev/null +++ b/mychart/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "mychart.serviceAccountName" . }} + labels: + {{- include "mychart.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/mychart/templates/tests/test-connection.yaml b/mychart/templates/tests/test-connection.yaml new file mode 100644 index 0000000..44cb16d --- /dev/null +++ b/mychart/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "mychart.fullname" . }}-test-connection" + labels: + {{- include "mychart.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "mychart.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/mychart/values.yaml b/mychart/values.yaml new file mode 100644 index 0000000..0a8a529 --- /dev/null +++ b/mychart/values.yaml @@ -0,0 +1,82 @@ +# Default values for mychart. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: 211223789150.dkr.ecr.us-east-1.amazonaws.com/my-docker-repo + 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: {} diff --git a/requirements.txt b/requirements.txt index 632a1ef..08a66df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -Flask==0.10.1 +Flask==2.0.3 +Werkzeug==2.0.3 diff --git a/templates/index.html b/templates/index.html index 7984c66..5435f6a 100644 --- a/templates/index.html +++ b/templates/index.html @@ -3,7 +3,7 @@