Skip to content

Commit a6bce57

Browse files
georglauterbachgeorglauterbach
authored
Merge pull request #41 from rspier/tvial
2 parents a45475d + e4acd3e commit a6bce57

6 files changed

Lines changed: 42 additions & 46 deletions

File tree

.ci/scripts/local-kube-score.sh renamed to .ci/scripts/kube-score.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
#!/bin/bash
22

3+
KUBE_SCORE=${KUBE_SCORE:-kube-score}
34

45
for chart in `ls charts`;
56
do
6-
helm template --values charts/$chart/ci/ci-values.yaml charts/$chart | kube-score score - \
7+
helm template --values charts/$chart/ci/ci-values.yaml charts/$chart | ${KUBE_SCORE} score - \
78
--ignore-test pod-networkpolicy \
89
--ignore-test deployment-has-poddisruptionbudget \
910
--ignore-test deployment-has-host-podantiaffinity \
1011
--ignore-test pod-probes \
1112
--ignore-test container-image-tag \
1213
--enable-optional-test container-security-context-privileged \
13-
--ignore-test container-security-context
14+
--ignore-test container-security-context \
15+
--ignore-test container-security-context-user-group-id \
16+
--ignore-test container-security-context-readonlyrootfilesystem \
17+
#
1418
done

‎.github/workflows/on-push-lint-charts.yml‎

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@ on:
1212
workflow_dispatch:
1313

1414
env:
15-
KUBE_SCORE_VERSION: 1.10.0
15+
KUBE_SCORE_VERSION: 1.12.0
1616
HELM_VERSION: v3.4.1
1717

18+
concurrency:
19+
group: ${{ github.head_ref }}
20+
cancel-in-progress: true
21+
1822
jobs:
1923
lint-test:
2024
runs-on: ubuntu-latest
@@ -31,26 +35,35 @@ jobs:
3135

3236
- name: Set up kube-score
3337
run: |
34-
wget https://github.com/zegl/kube-score/releases/download/v${{ env.KUBE_SCORE_VERSION }}/kube-score_${{ env.KUBE_SCORE_VERSION }}_linux_amd64 -O kube-score
35-
chmod 755 kube-score
38+
mkdir /tmp/bin
39+
wget https://github.com/zegl/kube-score/releases/download/v${{ env.KUBE_SCORE_VERSION }}/kube-score_${{ env.KUBE_SCORE_VERSION }}_linux_amd64 -O /tmp/bin/kube-score
40+
chmod 755 /tmp/bin/kube-score
3641
3742
- name: Kube-score generated manifests
38-
run: helm template --values .ci/values-kube-score.yaml charts/* | ./kube-score score -
39-
--ignore-test pod-networkpolicy
40-
--ignore-test deployment-has-poddisruptionbudget
41-
--ignore-test deployment-has-host-podantiaffinity
42-
--ignore-test container-security-context
43-
--ignore-test pod-probes
44-
--ignore-test container-image-tag
45-
--enable-optional-test container-security-context-privileged
43+
env:
44+
KUBE_SCORE: /tmp/bin/kube-score
45+
run: .ci/scripts/kube-score.sh
46+
47+
chart-testing:
48+
runs-on: ubuntu-latest
49+
strategy:
50+
matrix:
51+
# Choose from https://hub.docker.com/r/kindest/node/tags
52+
KubeVersion: [1.18.15,1.19.11,1.20.2]
53+
54+
steps:
55+
- name: Checkout
56+
uses: actions/checkout@v2
57+
with:
58+
fetch-depth: 0
4659

4760
# python is a requirement for the chart-testing action below (supports yamllint among other tests)
4861
- uses: actions/setup-python@v2
4962
with:
5063
python-version: 3.7
5164

5265
- name: Set up chart-testing
53-
uses: helm/chart-testing-action@v2.0.1
66+
uses: helm/chart-testing-action@v2.1.0
5467

5568
- name: Run chart-testing (list-changed)
5669
id: list-changed
@@ -63,33 +76,12 @@ jobs:
6376
- name: Run chart-testing (lint)
6477
run: ct lint --config .ci/ct-config.yaml
6578

66-
# Refer to https://github.com/kubernetes-sigs/kind/releases when updating the node_images
67-
- name: Create 1.20 kind cluster
68-
uses: helm/kind-action@v1.1.0
69-
with:
70-
node_image: kindest/node:v1.20.2@sha256:8f7ea6e7642c0da54f04a7ee10431549c0257315b3a634f6ef2fecaaedb19bab
71-
cluster_name: kubernetes-1.20
72-
if: steps.list-changed.outputs.changed == 'true'
73-
74-
- name: Run chart-testing (install) against 1.20
75-
run: ct install --config .ci/ct-config.yaml
76-
77-
- name: Create 1.19 kind cluster
78-
uses: helm/kind-action@v1.1.0
79-
with:
80-
node_image: kindest/node:v1.19.7@sha256:a70639454e97a4b733f9d9b67e12c01f6b0297449d5b9cbbef87473458e26dca
81-
cluster_name: kubernetes-1.19
82-
if: steps.list-changed.outputs.changed == 'true'
83-
84-
- name: Run chart-testing (install) against 1.19
85-
run: ct install --config .ci/ct-config.yaml
86-
87-
- name: Create 1.18 kind cluster
88-
uses: helm/kind-action@v1.1.0
79+
- name: Create ${{matrix.KubeVersion}} kind cluster
80+
uses: helm/kind-action@v1.2.0
8981
with:
90-
node_image: kindest/node:v1.18.15@sha256:5c1b980c4d0e0e8e7eb9f36f7df525d079a96169c8a8f20d8bd108c0d0889cc4
91-
cluster_name: kubernetes-1.18
82+
node_image: kindest/node:v${{matrix.KubeVersion}}
83+
cluster_name: kubernetes-${{matrix.KubeVersion}}
9284
if: steps.list-changed.outputs.changed == 'true'
9385

94-
- name: Run chart-testing (install) against 1.18
95-
run: ct install --config .ci/ct-config.yaml
86+
- name: Run chart-testing (install) against ${{matrix.KubeVersion}}
87+
run: ct install --config .ci/ct-config.yaml

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ The following table lists the configurable parameters of the docker-mailserver c
196196

197197
| Parameter | Description | Default |
198198
|---------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------|
199-
| `image.name` | The name of the container image to use | `tvial/docker-mailserver` |
199+
| `image.name` | The name of the container image to use | `mailserver/docker-mailserver` |
200200
| `image.tag` | The image tag to use (You may prefer "latest" over "v6.1.0", for example) | `release-v6.1.0` |
201201
| `demoMode.enabled` | Start the container with a demo "user@example.com" user (password is "password") | `true` |
202202
| `haproxy.enabled` | Support HAProxy PROXY protocol on SMTP, IMAP(S), and POP3(S) connections. Provides real source IP instead of load balancer IP | `true` |

‎charts/docker-mailserver/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: "8.0.1"
33
description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
44
name: docker-mailserver
5-
version: 0.3.0
5+
version: 0.3.1
66
sources:
77
- https://github.com/funkypenguin/helm-docker-mailserver
88
maintainers:

‎charts/docker-mailserver/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ The following table lists the configurable parameters of the docker-mailserver c
196196

197197
| Parameter | Description | Default |
198198
|---------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------|
199-
| `image.name` | The name of the container image to use | `tvial/docker-mailserver` |
199+
| `image.name` | The name of the container image to use | `mailserver/docker-mailserver` |
200200
| `image.tag` | The image tag to use (You may prefer "latest" over "v6.1.0", for example) | `release-v6.1.0` |
201201
| `demoMode.enabled` | Start the container with a demo "user@example.com" user (password is "password") | `true` |
202202
| `haproxy.enabled` | Support HAProxy PROXY protocol on SMTP, IMAP(S), and POP3(S) connections. Provides real source IP instead of load balancer IP | `true` |

‎charts/docker-mailserver/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
image:
3-
# image.name is the name of the container image to use. Refer to https://hub.docker.com/r/tvial/docker-mailserver
3+
# image.name is the name of the container image to use. Refer to https://hub.docker.com/r/mailserver/docker-mailserver
44
name: "mailserver/docker-mailserver"
5-
# image.tag is the tag of the container image to use. Refer to https://hub.docker.com/r/tvial/docker-mailserver
5+
# image.tag is the tag of the container image to use. Refer to https://hub.docker.com/r/mailserver/docker-mailserver
66
tag: "8.0.1"
77
pullPolicy: "IfNotPresent"
88

0 commit comments

Comments
 (0)