Merge pull request #262 from christianang/markdownlint-release-1.11.0

[release-1.11.0] Update node version, and change base image of markdownlint (#182)

.github/workflows/actions.yml

@@ -27,9 +27,9 @@ jobs:
         run: cd hack/tools && make golangci-lint
 
       - name: Install npm
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '20'
 
       - name: Install markdown-lint tool
         run: npm install -g markdownlint-cli

.github/workflows/push.yml

@@ -21,9 +21,9 @@ jobs:
         run: cd hack/tools && make golangci-lint
 
       - name: Install npm
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '20'
 
       - name: Install markdown-lint tool
         run: npm install -g markdownlint-cli

Makefile

@@ -180,7 +180,7 @@ lint-markdown: ## Lint the project's markdown
 ifdef GITHUB_ACTIONS
 	markdownlint -c md-config.json .
 else
-	docker run -i --rm -v "$$(pwd)":/work $(CACHE_IMAGE_REGISTRY)/tmknom/markdownlint -c /work/md-config.json .
+	docker run -i --rm -v "$$(pwd)":/work ghcr.io/tmknom/dockerfiles/markdownlint -c /work/md-config.json .
 endif
 
 .PHONY: lint-shell

controllers/machine/machine_controller_intg_test.go

@@ -93,13 +93,16 @@ func intgTestMachineController() {
 			})
 			It("Corresponding Endpoints should be created", func() {
 				ep := &corev1.Endpoints{}
-				Eventually(func() bool {
+				Eventually(func() int {
 					err := ctx.Client.Get(ctx.Context, client.ObjectKey{Name: cluster.Namespace + "-" + cluster.Name + "-control-plane", Namespace: cluster.Namespace}, ep)
-					return err == nil
-				}).Should(BeTrue())
-				Expect(ep.Subsets).ShouldNot(BeNil())
-				Expect(ep.Subsets[0].Addresses).ShouldNot(BeNil())
-				Expect(len(ep.Subsets[0].Addresses)).Should(Equal(1))
+					if err != nil {
+						return 0
+					}
+					if len(ep.Subsets) == 0 {
+						return 0
+					}
+					return len(ep.Subsets[0].Addresses)
+				}).Should(Equal(1))
 				Expect(ep.Subsets[0].Addresses[0].IP).Should(Equal("1.1.1.1"))
 			})
 			It("Should add one more machine", func() {