Skip to content

Commit 52be0fb

Browse files
chore: replace quintush/helm-unittest with helm-unittest/helm-unittest (#8904)
* chore: replace quintush/helm-unittest with helm-unittest/helm-unittest * chore: bump docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent to 6154e14d tag
1 parent a72c144 commit 52be0fb

22 files changed

+67
-73
lines changed

.buildkite/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# This Makefile is used to run the buildkite agent in virtual machines when Docker access is required.
66

7-
CI_IMAGE ?= docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
7+
CI_IMAGE ?= docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
88
ROOT_DIR := $(CURDIR)/..
99
GO_MOUNT_PATH ?= /go/src/github.com/elastic/cloud-on-k8s
1010
export VAULT_ROOT_PATH = secret/ci/elastic-cloud-on-k8s

.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ steps:
3333
machineType: "{{ $.K8sInDockerMachineType }}"
3434
{{- end }}
3535
{{- else }}
36-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
36+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
3737
memory: "5G"
3838
{{- end }}
3939

@@ -85,7 +85,7 @@ steps:
8585
diskSizeGb: 150
8686
{{- end }}
8787
{{- else }}
88-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
88+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
8989
memory: "4G"
9090
{{- end }}
9191

@@ -121,7 +121,7 @@ steps:
121121
{{- if not $test.Dind }}
122122
- make run-deployer
123123
agents:
124-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
124+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
125125
memory: "4G"
126126
{{- else }}
127127
- make -C .buildkite TARGET="run-deployer" ci
@@ -144,5 +144,5 @@ steps:
144144
- ".buildkite/e2e/reporter/*.md"
145145
- ".buildkite/e2e/reporter/*.yml"
146146
agents:
147-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
147+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
148148
memory: "2G"

.buildkite/e2e/reporter/templates/notify-failures.tpl.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
- label: "{{ .ShortFailuresCount }} failure(s)"
55
command: exit {{ .ShortFailuresCount }}
66
agents:
7-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
7+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
88
memory: "2G"
99

1010
# notify e2e tests failures for the main branch and tags
@@ -13,7 +13,7 @@ steps:
1313
if: build.branch == "main" || build.tag != null
1414
command: echo "notify"
1515
agents:
16-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
16+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
1717
memory: "2G"
1818

1919
notify:

.buildkite/pipeline-e2e-clusters-cleanup.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
- make build-deployer
1111
- buildkite-agent artifact upload hack/deployer/deployer
1212
agents:
13-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
13+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
1414
memory: 2G
1515

1616
- label: ":broom: e2e test cluster cleanup gke"
@@ -26,7 +26,7 @@ steps:
2626
- chmod u+x /usr/local/hack/deployer/deployer
2727
- /usr/local/hack/deployer/deployer cleanup --plans-file hack/deployer/config/plans.yml --cluster-prefix $${E2E_TEST_CLUSTER_PREFIX} --config-file deployer-config.yml
2828
agents:
29-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
29+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
3030
memory: 2G
3131

3232
- label: ":broom: e2e test cluster cleanup aks"
@@ -55,7 +55,7 @@ steps:
5555
- chmod u+x /usr/local/hack/deployer/deployer
5656
- /usr/local/hack/deployer/deployer cleanup --plans-file hack/deployer/config/plans.yml --cluster-prefix $${E2E_TEST_CLUSTER_PREFIX} --config-file deployer-config.yml
5757
agents:
58-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
58+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
5959
memory: 2G
6060

6161
- label: ":broom: e2e test cluster cleanup eks-arm"
@@ -71,7 +71,7 @@ steps:
7171
- chmod u+x /usr/local/hack/deployer/deployer
7272
- /usr/local/hack/deployer/deployer cleanup --plans-file hack/deployer/config/plans.yml --cluster-prefix $${E2E_TEST_CLUSTER_PREFIX} --config-file deployer-config.yml
7373
agents:
74-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
74+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
7575
memory: 2G
7676

7777
- label: ":broom: e2e test cluster cleanup ocp"

.buildkite/pipeline-e2e-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
E2E_PROVIDER: gke
1818
DEF
1919
agents:
20-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
20+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
2121
memory: "2G"
2222

2323
# for nightly builds from main
@@ -30,7 +30,7 @@ steps:
3030
cd .buildkite/e2e/pipeline-gen && go build -o pipeline-gen
3131
cat ../nightly-main-matrix.yaml | ./pipeline-gen | buildkite-agent pipeline upload
3232
agents:
33-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
33+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
3434
memory: "2G"
3535

3636
# for all tags
@@ -41,5 +41,5 @@ steps:
4141
cd .buildkite/e2e/pipeline-gen && go build -o pipeline-gen
4242
cat ../release-branch-matrix.yaml | ./pipeline-gen | buildkite-agent pipeline upload
4343
agents:
44-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
44+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
4545
memory: "2G"

.buildkite/pipeline-release-helm.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ steps:
1111
- make build
1212
- buildkite-agent artifact upload bin/releaser
1313
agents:
14-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
14+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
1515
memory: "2G"
1616

1717
- label: "operator dev helm chart"
@@ -30,7 +30,7 @@ steps:
3030
- chmod u+x /usr/local/bin/releaser
3131
- releaser --env=dev --charts-dir=deploy/eck-operator
3232
agents:
33-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
33+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
3434
memory: "2G"
3535

3636
- label: "eck-stack dev helm charts"
@@ -49,7 +49,7 @@ steps:
4949
- chmod u+x /usr/local/bin/releaser
5050
- releaser --env=dev --charts-dir=deploy/eck-stack
5151
agents:
52-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
52+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
5353
memory: "2G"
5454

5555
- label: "operator prod helm chart"
@@ -65,7 +65,7 @@ steps:
6565
- chmod u+x /usr/local/bin/releaser
6666
- releaser --env=prod --charts-dir=deploy/eck-operator
6767
agents:
68-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
68+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
6969
memory: "2G"
7070

7171
- label: "eck-stack prod helm charts"
@@ -80,5 +80,5 @@ steps:
8080
- chmod u+x /usr/local/bin/releaser
8181
- releaser --env=prod --charts-dir=deploy/eck-stack
8282
agents:
83-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
83+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
8484
memory: "2G"

.buildkite/pipeline-release-redhat.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
- make build
88
- buildkite-agent artifact upload bin/operatorhub
99
agents:
10-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
10+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
1111
memory: "4G"
1212

1313
- label: ":docker: push container"
@@ -20,7 +20,7 @@ steps:
2020
cd hack/operatorhub
2121
operatorhub container push
2222
agents:
23-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
23+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
2424
memory: "4G"
2525

2626
- label: ":docker: preflight container check"
@@ -32,7 +32,7 @@ steps:
3232
commands:
3333
- .buildkite/scripts/release/redhat-preflight.sh
3434
agents:
35-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
35+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
3636
memory: "4G"
3737

3838
- label: ":docker: publish container"
@@ -47,7 +47,7 @@ steps:
4747
cd hack/operatorhub
4848
operatorhub container publish
4949
agents:
50-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
50+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
5151
memory: "4G"
5252

5353
- label: ":redhat: generate and create-pr"
@@ -62,5 +62,5 @@ steps:
6262
operatorhub generate-manifests
6363
operatorhub bundle create-pr
6464
agents:
65-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
65+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
6666
memory: "4G"

.buildkite/pipeline-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ steps:
1010
commands:
1111
- .buildkite/scripts/release/k8s-manifests.sh
1212
agents:
13-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
13+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
1414
memory: "2G"
1515

1616
- label: "copy images to dockerhub"

.buildkite/pipeline.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ steps:
99
- label: ":go: lint"
1010
command: "make lint check-local-changes"
1111
agents:
12-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
12+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
1313
cpu: "6"
1414
memory: "7G"
1515

1616
- label: ":go: generate"
1717
command: "make generate check-local-changes"
1818
agents:
19-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
19+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
2020
cpu: "4"
2121
memory: "4G"
2222

@@ -25,7 +25,7 @@ steps:
2525
- "make check-license-header check-predicates shellcheck reattach-pv"
2626
- "make -C hack/helm/release build"
2727
agents:
28-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
28+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
2929
cpu: "4"
3030
memory: "4G"
3131

@@ -35,28 +35,28 @@ steps:
3535
- label: ":go: unit-tests"
3636
command: "make unit-xml"
3737
agents:
38-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
38+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
3939
cpu: "4"
4040
memory: "4G"
4141

4242
- label: ":go: integration-tests"
4343
command: "make integration-xml"
4444
agents:
45-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
45+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
4646
cpu: "4"
4747
memory: "4G"
4848

4949
- label: ":go: manifest-gen-tests"
5050
command: "make manifest-gen-test"
5151
agents:
52-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
52+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
5353
cpu: "4"
5454
memory: "2G"
5555

5656
- label: ":go: helm-tests"
5757
command: "make helm-test"
5858
agents:
59-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
59+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
6060
cpu: "4"
6161
memory: "2G"
6262

@@ -112,7 +112,7 @@ steps:
112112
E2E_SKIP_CLEANUP: true
113113
DEF
114114
agents:
115-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
115+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
116116
memory: "2G"
117117

118118
# for PR comment
@@ -125,14 +125,14 @@ steps:
125125
$$(echo ./pipeline-gen $$GITHUB_PR_COMMENT_VAR_ARGS) \
126126
| buildkite-agent pipeline upload
127127
agents:
128-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
128+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
129129
memory: "2G"
130130

131131
# for the main branch (merge and nightly) and tags
132132
- label: ":buildkite:"
133133
command: buildkite-agent pipeline upload .buildkite/pipeline-e2e-tests.yml
134134
agents:
135-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
135+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
136136
memory: "2G"
137137

138138
# ----------
@@ -165,13 +165,13 @@ steps:
165165
done
166166
) | buildkite-agent pipeline upload
167167
agents:
168-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
168+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
169169
memory: "256Mi"
170170

171171
- label: ":buildkite:"
172172
depends_on:
173173
- "operator-image-build"
174174
command: buildkite-agent pipeline upload .buildkite/pipeline-release.yml
175175
agents:
176-
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:a9130ecd
176+
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:6154e14d
177177
memory: "2G"

deploy/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ kubectl get elastic -l "app.kubernetes.io/instance"=es-kb-quickstart -n elastic-
5252

5353
### ECK Helm Chart test suite
5454

55-
[Helm UnitTest Plugin](https://github.com/quintush/helm-unittest) is used to ensure Helm Charts render properly.
55+
[Helm UnitTest Plugin](https://github.com/helm-unittest/helm-unittest) is used to ensure Helm Charts render properly.
5656

5757
#### Installation
5858

5959
```
60-
helm plugin install https://github.com/quintush/helm-unittest --version 0.2.8
60+
helm plugin install https://github.com/helm-unittest/helm-unittest.git --version 1.0.3
6161
```
6262

6363
#### Running Test Suite

0 commit comments

Comments
 (0)