Skip to content

Commit 70de9fb

Browse files
lubronzhanchristianang
authored andcommitted
Update node version, and change base image of markdownlint (#182)
* Update node version * Improve integration test * change base image of markdownlint to not to pull from docker --------- Signed-off-by: Lubron Zhan <[email protected]>
1 parent ce32f01 commit 70de9fb

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

.github/workflows/actions.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
run: cd hack/tools && make golangci-lint
2828

2929
- name: Install npm
30-
uses: actions/setup-node@v2
30+
uses: actions/setup-node@v4
3131
with:
32-
node-version: '14'
32+
node-version: '20'
3333

3434
- name: Install markdown-lint tool
3535
run: npm install -g markdownlint-cli

.github/workflows/push.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
run: cd hack/tools && make golangci-lint
2222

2323
- name: Install npm
24-
uses: actions/setup-node@v2
24+
uses: actions/setup-node@v4
2525
with:
26-
node-version: '14'
26+
node-version: '20'
2727

2828
- name: Install markdown-lint tool
2929
run: npm install -g markdownlint-cli

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ lint-markdown: ## Lint the project's markdown
180180
ifdef GITHUB_ACTIONS
181181
markdownlint -c md-config.json .
182182
else
183-
docker run -i --rm -v "$$(pwd)":/work $(CACHE_IMAGE_REGISTRY)/tmknom/markdownlint -c /work/md-config.json .
183+
docker run -i --rm -v "$$(pwd)":/work ghcr.io/tmknom/dockerfiles/markdownlint -c /work/md-config.json .
184184
endif
185185

186186
.PHONY: lint-shell

controllers/machine/machine_controller_intg_test.go

+9-6
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,16 @@ func intgTestMachineController() {
9393
})
9494
It("Corresponding Endpoints should be created", func() {
9595
ep := &corev1.Endpoints{}
96-
Eventually(func() bool {
96+
Eventually(func() int {
9797
err := ctx.Client.Get(ctx.Context, client.ObjectKey{Name: cluster.Namespace + "-" + cluster.Name + "-control-plane", Namespace: cluster.Namespace}, ep)
98-
return err == nil
99-
}).Should(BeTrue())
100-
Expect(ep.Subsets).ShouldNot(BeNil())
101-
Expect(ep.Subsets[0].Addresses).ShouldNot(BeNil())
102-
Expect(len(ep.Subsets[0].Addresses)).Should(Equal(1))
98+
if err != nil {
99+
return 0
100+
}
101+
if len(ep.Subsets) == 0 {
102+
return 0
103+
}
104+
return len(ep.Subsets[0].Addresses)
105+
}).Should(Equal(1))
103106
Expect(ep.Subsets[0].Addresses[0].IP).Should(Equal("1.1.1.1"))
104107
})
105108
It("Should add one more machine", func() {

0 commit comments

Comments
 (0)