Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidated Lagoon 2.12 release - Kubernetes 1.21 minimum #526

Merged
merged 18 commits into from
Feb 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions .github/workflows/test-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,24 @@ jobs:
- active-standby-kubernetes
- api
- deploytarget
- features-variables
- features-kubernetes
- features-kubernetes-2
- features-variables
- services
- tasks
- dbaas
- ssh-portal
## Re-enable any of these below tests in your branch for specific testing
## - drupal-php74
## - drupal-php80
## - drupal-postgres
## Re-enable any of these tests in your branch for specific testing
## - bitbucket
## - bulk-deployment
## - drush
## - generic
## - github
## - gitlab
## - image-cache
## - node-mongodb
## - nginx
## - node
## - python
## - elasticsearch
## - github
## - gitlab
## - bitbucket
## - ssh-legacy
## - workflows

steps:
# Continue after getting a shell via: `touch continue`
Expand Down
8 changes: 3 additions & 5 deletions charts/lagoon-build-deploy/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,15 @@ maintainers:
- name: smlx
email: scott.leggett@amazee.io
url: https://amazee.io
kubeVersion: ">= 1.19.0-0"
kubeVersion: ">= 1.21.0-0"

type: application

version: 0.19.0
version: 0.20.0

appVersion: v0.9.0

annotations:
artifacthub.io/changes: |
- kind: changed
description: bump remote-controller to v0.9.0
- kind: changed
description: remove monitoringUrls from CRDs (require CRDs to be updated, see installation notes)
description: introduced minimum kubernetes version 1.21
10 changes: 6 additions & 4 deletions charts/lagoon-core/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ maintainers:
- name: shreddedbacon
email: ben.jackson@amazee.io
url: https://amazee.io
kubeVersion: ">= 1.19.0-0"
kubeVersion: ">= 1.21.0-0"

# Application charts are a collection of templates that can be packaged into
# versioned archives to be deployed.
Expand All @@ -21,13 +21,13 @@ type: application
# 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.22.0
version: 1.23.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.
appVersion: v2.11.0
appVersion: v2.12.0

dependencies:
- name: nats
Expand All @@ -41,4 +41,6 @@ dependencies:
annotations:
artifacthub.io/changes: |
- kind: changed
description: configured dynamic apiVersion for HorizontalPodAutoscaler
description: introduced minimum kubernetes version 1.21
- kind: changed
description: update Lagoon appVersion to v2.12.0
10 changes: 0 additions & 10 deletions charts/lagoon-core/ci/linter-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@ defaultIngressClassName: nginx
lagoonAPIURL: https://api.example.com/graphql
keycloakAPIURL: https://keycloak.example.com/auth

buildDeployImage:
default:
image: uselagoon/build-deploy-image:latest
edge:
enabled: true
image: uselagoon/build-deploy-image:edge

api:
replicaCount: 1
image:
Expand Down Expand Up @@ -84,14 +77,11 @@ ui:
replicaCount: 1
image:
repository: uselagoon/ui
tag: main

backupHandler:
replicaCount: 1
image:
repository: uselagoon/backup-handler
autoscaling:
enabled: true

insightsHandler:
image:
Expand Down
8 changes: 4 additions & 4 deletions charts/lagoon-logging/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ maintainers:
- name: smlx
email: scott.leggett@amazee.io
url: https://amazee.io
kubeVersion: ">= 1.19.0-0"
kubeVersion: ">= 1.21.0-0"

# Application charts are a collection of templates that can be packaged into
# versioned archives to be deployed.
Expand All @@ -19,7 +19,7 @@ type: application
# 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.74.3
version: 0.75.0

dependencies:
- name: logging-operator
Expand All @@ -32,5 +32,5 @@ dependencies:
# Valid supported kinds are added, changed, deprecated, removed, fixed and security
annotations:
artifacthub.io/changes: |
- kind: fixed
description: Reduce DNS cache TTL from 6 hours to 1 hour to adapt to DNS changes more quickly.
- kind: changed
description: introduced minimum kubernetes version 1.21
6 changes: 3 additions & 3 deletions charts/lagoon-logs-concentrator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ maintainers:
- name: smlx
email: scott.leggett@amazee.io
url: https://amazee.io
kubeVersion: ">= 1.19.0-0"
kubeVersion: ">= 1.21.0-0"

# Application charts are a collection of templates that can be packaged into
# versioned archives to be deployed.
Expand All @@ -19,12 +19,12 @@ type: application
# 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.44.0
version: 0.45.0

# This section is used to collect a changelog for artifacthub.io
# It should be started afresh for each release
# Valid supported kinds are added, changed, deprecated, removed, fixed and security
annotations:
artifacthub.io/changes: |
- kind: changed
description: configured dynamic apiVersion for HorizontalPodAutoscaler
description: introduced minimum kubernetes version 1.21
6 changes: 3 additions & 3 deletions charts/lagoon-remote/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies:
- name: lagoon-build-deploy
repository: https://uselagoon.github.io/lagoon-charts/
version: 0.18.1
version: 0.19.0
- name: dioscuri
repository: https://amazeeio.github.io/charts/
version: 0.4.1
Expand All @@ -11,5 +11,5 @@ dependencies:
- name: nats
repository: https://nats-io.github.io/k8s/helm/charts/
version: 0.18.3
digest: sha256:1018b08ca55534e25872062782c15d58d4ae03129374ce015e62306ce319b353
generated: "2022-11-24T11:53:05.091683188+11:00"
digest: sha256:8a65f7fdd1dd221e3e780b71b9c3e31e6918cb93f6e652527afc6302c294ab34
generated: "2023-02-03T12:00:16.291578794+11:00"
12 changes: 8 additions & 4 deletions charts/lagoon-remote/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ maintainers:
- name: smlx
email: scott.leggett@amazee.io
url: https://amazee.io
kubeVersion: ">= 1.19.0-0"
kubeVersion: ">= 1.21.0-0"

# Application charts are a collection of templates that can be packaged into
# versioned archives to be deployed.
Expand All @@ -19,11 +19,11 @@ 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.
version: 0.73.0
version: 0.74.0

dependencies:
- name: lagoon-build-deploy
version: ~0.18.0
version: ~0.19.0
repository: https://uselagoon.github.io/lagoon-charts/
condition: lagoon-build-deploy.enabled
- name: dioscuri
Expand All @@ -45,4 +45,8 @@ dependencies:
annotations:
artifacthub.io/changes: |
- kind: changed
description: Update ssh-portal to v0.27.2.
description: introduced minimum kubernetes version 1.21
- kind: changed
description: update docker-host image to v3.3.0
- kind: changed
description: update lagoon-build-deploy chart to v0.19.0
2 changes: 1 addition & 1 deletion charts/lagoon-remote/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dockerHost:
repository: uselagoon/docker-host
pullPolicy: Always
# Overrides the image tag whose default is "latest".
tag: "v3.1.0"
tag: "v3.3.0"

name: docker-host

Expand Down
14 changes: 10 additions & 4 deletions charts/lagoon-test/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,24 @@ maintainers:
- name: smlx
email: scott.leggett@amazee.io
url: https://amazee.io
kubeVersion: ">= 1.19.0-0"
kubeVersion: ">= 1.21.0-0"

type: application

version: 0.41.0
version: 0.42.0

appVersion: v2.10.0
appVersion: v2.12.0

# This section is used to collect a changelog for artifacthub.io
# It should be started afresh for each release
# Valid supported kinds are added, changed, deprecated, removed, fixed and security
annotations:
artifacthub.io/changes: |
- kind: added
description: Add ssh-token environment variables to test container.
description: added services test and deprecated old tests
- kind: changed
description: introduced minimum kubernetes version 1.21
- kind: changed
description: Use new startup probe on api-data-watcher-pusher.
- kind: changed
description: update Lagoon appVersion to v2.12.0
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,13 @@ spec:
key: JWTSECRET
- name: TOKEN
value: {{ required "A valid .Values.token required!" .Values.token | quote }}
readinessProbe:
startupProbe:
exec:
command:
- /bin/sh
- -c
# this container uses wget to inject test fixtures into the lagoon api.
# once wget stops running, it's good to go.
- "for i in $(seq 4); do pgrep wget && exit 1 || sleep 1; done"
initialDelaySeconds: 32
timeoutSeconds: 8
- test
- -f
- /tmp/api-data-pushed
failureThreshold: 90
resources:
{{- toYaml .Values.localAPIDataWatcherPusher.resources | nindent 10 }}
{{- with .Values.localAPIDataWatcherPusher.nodeSelector }}
Expand Down
20 changes: 18 additions & 2 deletions charts/lagoon-test/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,23 @@ tests:
tests: []
# This value is required when suiteEnabled is true, and must be set to one or
# more of the valid test suites:
# - features-kubernetes
# - active-standby-kubernetes
# - api
# - deploytarget
# - features-kubernetes
# - features-kubernetes-2
# - features-variables
# - services
# - ssh-portal
# - tasks
# - bitbucket
# - bulk-deployment
# - drush
# - generic
# - github
# - gitlab
# - image-cache
# - nginx
# - drupal
# - node
# - python
# - workflows