From: Adam Shamblin Date: Sun, 11 Dec 2022 21:35:12 +0000 (-0700) Subject: Update ingress definition after k8s upgrade X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=c91269abe3ae4386f0dcc00d553d88e606254971;p=letters.git Update ingress definition after k8s upgrade --- diff --git a/.gitignore b/.gitignore index e6e3288..592c69a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ __pycache__ output *.bak +*.tgz diff --git a/charts/index.yaml b/charts/index.yaml new file mode 100644 index 0000000..30c1bb9 --- /dev/null +++ b/charts/index.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +entries: + letters: + - apiVersion: v2 + appVersion: 1.16.0 + created: "2022-10-27T15:25:49.443963241-06:00" + description: A Helm chart for Kubernetes + digest: 343d7ff005a6a068d2a572fe23a3cf10005be23f1c1b0bfeac7b24f54dfe6fbb + name: letters + type: application + urls: + - letters-1.0.0.tgz + version: 1.0.0 +generated: "2022-10-27T15:25:49.443109868-06:00" diff --git a/charts/letters/Chart.yaml b/charts/letters/Chart.yaml index cb040b1..189cbb0 100644 --- a/charts/letters/Chart.yaml +++ b/charts/letters/Chart.yaml @@ -1,24 +1,6 @@ apiVersion: v2 name: letters -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. +description: The personal website of signal9 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. +version: 1.0.0 appVersion: "1.16.0" diff --git a/charts/letters/templates/ingress.yaml b/charts/letters/templates/ingress.yaml index 247dbdf..3961366 100644 --- a/charts/letters/templates/ingress.yaml +++ b/charts/letters/templates/ingress.yaml @@ -2,7 +2,7 @@ {{- $fullName := include "letters.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 {{- else -}} apiVersion: extensions/v1beta1 {{- end }} @@ -16,6 +16,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + ingressClassName: {{ .Values.ingress.ingressClassName }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} @@ -33,9 +34,12 @@ spec: paths: {{- range .paths }} - path: {{ .path }} + pathType: Prefix backend: - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} {{- end }} {{- end }} {{- end }} diff --git a/charts/letters/values.yaml b/charts/letters/values.yaml index b4f99ae..72160a4 100644 --- a/charts/letters/values.yaml +++ b/charts/letters/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 image: - repository: vexingworkshop/letters + repository: "git.vexingworkshop.com/signal9/letters" pullPolicy: Always tag: "latest" @@ -28,8 +28,8 @@ service: ingress: enabled: true + ingressClassName: nginx annotations: - kubernetes.io/ingress.class: nginx cert-manager.io/cluster-issuer: "acme-prod" hosts: - host: letters.vexingworkshop.com diff --git a/charts/pipeline/helm_vars/secrets.yaml b/charts/pipeline/helm_vars/secrets.yaml index a27b42b..6de8cea 100644 --- a/charts/pipeline/helm_vars/secrets.yaml +++ b/charts/pipeline/helm_vars/secrets.yaml @@ -2,15 +2,16 @@ github: interceptor: secret: ENC[AES256_GCM,data:c7MXYXyHeqJVNF+sBLBhquOLWHuIw8O+s6NEYP+Auw0=,iv:UbQ1myRZZOfefSC9sBSO3092Cstog8VO7zUigC7PMYI=,tag:2CxeahdOjq5rPmUk+FU5gg==,type:str] CR_PAT: ENC[AES256_GCM,data:4R6S6eeYR5inxGXYLwllFVb24ZPp57OWZK+iPzGmaK+6UhujzfgGvA==,iv:tfrP9pYle+jW3mGq/70OGCTJ3KPLS/FjXfX0Eh3Jjy4=,tag:Num9bnORs8+FB5kup4ApXQ==,type:str] -dockerconfigjson: ENC[AES256_GCM,data:b3R9lbb9oZmnAdNmuNX1/pLNpO39Z0ww3jDheGqnCapMAnbZ2uuT6uZ2boBHX73QOuNUS6ygPfwEo3l0hULhcISeV/+qdQBAKa6uUAXAB30LTakG5QAAVU4ZxT6E/h3vQ35UQgguac1bwFdZhR6SgLClvME9xfddyFZGllHyBVqMas2WWv62sY50VbU4vfTyryAy5oe4F1SslsM9Ui3bTRfYqCdyYdY+sBbp2XkTVJQVopYeAlQu7+T9vleJ3bMx3wOAwlMbZ+b15pPczRWtH+AHOd5ytL5w7sFPIGHyRtajR6Y8UtnQoKuUT4+HCrZNrfgWedhr+J+6yxIVShew4OY5mFaK9tJqq54oyygKG9Scc720L/cdrw==,iv:1zZ9T5mZ3cTxuxmHOtTOFjzvJ3zzzoyZ5j3VfUnpDMo=,tag:lbzBff4JzBh2Vh48OPMz6A==,type:str] +#ENC[AES256_GCM,data:gNuCkGhKlMRwEe+VJRCjnM6kWWtbJ/AO2VquPss4wL/ugJVsL6B9ZwEVHxzQawncpMOdy1y7HCcJNxdFNK80E1z3A3qKh5UcdlCMNn8RgiAODaOU7ZwLUpWfLIhBPigb9G2jjBbwK//InyYD6q4CEbM9lldg1zflAxMjRK3yupLvULnXqtQxWJRYvG2HRk/1c29PbIZOuHs3SAcmwR8jvs7amK53gLLdBiSJoURP65+1XPVOecxsYgbwJ4zO3KtAWWYyEkszDw6kGKlDtIk6heYhp+Eb16wFfN0yczUSybxt6lrr1tb2s1kbdk1M6ja32+xooLIgEOJtNMRTXCP08vpLJAaQWSbDdryV1fLxkrynBw/SPnALwTOd57+zzidGLZhlOIgrh2hxrQ==,iv:kwfZmXKRkkwFixhn8Ws384+qzVcLcC1j3RkcaWLG4zE=,tag:NIiKVoD3elbnaQmP+IQkdQ==,type:comment] +dockerconfigjson: ENC[AES256_GCM,data:OBSIPR4VPSCMGDP0B7H6qyA1ROM7EInI3RgQ3IC8lvYh2hgcGOBc8Y/sFKUzLfkzgb+MeyOOw6tQ2Kc6XQXCYNvAqPVlB3r9Z8xOSMUEwL54saV6EmKK4VbSpcmehqOtD74Y/vMEdBgfbPzUiuQty5zZW/ALKs4GjI1xSNDZlRehc/xKIjuhyVSTySfCLnqFOxM5NpppzR0ct6ZUZPE20nv5zRtK4mipHkYarygDEkI6zFYAmePZokA9O23brmaFfx8XjB5kuayPySqf7dg/dMNHdJCCKhHjzR+07dWtCD1/iA99vQLEfIU8fbIEDP7++HpT2rojC24CWfnR/Uieipj6IBfr+/pzYUoyaKjLhHe7F7Ghxl1lqA==,iv:y7yjhEf3WrBQZCzG49ZotwNoNotuB5OldI/ViXPbvzY=,tag:zPm4Fc6AhRkOfAmagV4dqg==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-03-20T23:46:34Z" - mac: ENC[AES256_GCM,data:GcC69/bm14DC0ZVIhKPDGRrzC7WtH7I+TGRlPzfbD+yxaUySEHjEwTJ5TCrEVayM7IZDQ0WH7RR/AqzDDmjgw5w3D9qs55fRyM3L+aZhZExWexVFBqT/WWdAfM+r3DC9JPJ5CE6ulbA9J1WuvMSIAbNQvZCWEyB6RbVnFT3ZgBk=,iv:0rYhc8VZgwHz7w0QsmS9KCvoWRV9YyKuspDLvwKd+Ko=,tag:QDJHvNtnJU3lCvtW71lJYg==,type:str] + lastmodified: "2022-03-21T02:26:11Z" + mac: ENC[AES256_GCM,data:xtG2rBV7Ad+yAbcXY4fSRKG74h0ykq+lpP70U2cBorF2q6OYdhkNxj+3XeYqO69biJNxt32EKG3lOKFcsdfDnqkZxrggAXH8ZjM6l0JW07EGVyjTw2vgauWNmIJrWgWeoT4Qg+/qFPlJeyRbpZje9BK1anG410jM4yw6mEiiRTY=,iv:W2IzaMiXVht4VkyVfbSoTLINBjzcTJGc0N8B3V8g4pA=,tag:QkUojTTrP0BA9asVlVkuig==,type:str] pgp: - created_at: "2021-11-02T22:20:13Z" enc: | diff --git a/charts/pipeline/templates/pipeline.yaml b/charts/pipeline/templates/pipeline.yaml index c64a57f..a02c430 100644 --- a/charts/pipeline/templates/pipeline.yaml +++ b/charts/pipeline/templates/pipeline.yaml @@ -27,6 +27,8 @@ spec: description: shared space containing source code - name: dockerconfig description: secret containing dockerconfigjson value + - name: ssh-config + description: ssh creds needed to pull from github tasks: - name: pull-source taskRef: @@ -38,6 +40,8 @@ spec: workspaces: - name: output workspace: source + - name: ssh-directory + workspace: ssh-config - name: build-container taskRef: name: kaniko diff --git a/charts/pipeline/templates/trigger.yaml b/charts/pipeline/templates/trigger.yaml index fa5ac1b..914daea 100644 --- a/charts/pipeline/templates/trigger.yaml +++ b/charts/pipeline/templates/trigger.yaml @@ -84,6 +84,9 @@ spec: - name: dockerconfig secret: secretName: github-docker-config + - name: ssh-config + secret: + secretName: ssh-config params: - name: repo-url value: $(tt.params.repo-url) diff --git a/ingress-with-tls.yaml b/ingress-with-tls.yaml new file mode 100644 index 0000000..1bdd9ed --- /dev/null +++ b/ingress-with-tls.yaml @@ -0,0 +1,27 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + nginx.ingress.kubernetes.io/proxy-body-size: "0" + nginx.ingress.kubernetes.io/proxy-read-timeout: "600" + nginx.ingress.kubernetes.io/proxy-send-timeout: "600" + kubernetes.io/tls-acme: 'true' + name: docker-registry + namespace: docker-registry +spec: + ingressClassName: nginx + tls: + - hosts: + - registry. + secretName: registry-tls + rules: + - host: registry. + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: docker-registry + port: + number: 5000