Skip to content

Commit 9403344

Browse files
committed
enable linting on whole repo on github workflow, unify yamlling config, more minor fixes
1 parent bb46796 commit 9403344

File tree

18 files changed

+40
-33
lines changed

18 files changed

+40
-33
lines changed

.github/workflows/yamllint.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ name: Yaml Lint
1515
on: # yamllint disable-line rule:truthy
1616
pull_request:
1717
paths:
18-
- '.semaphore/**/*.yml'
19-
- '.semaphore/.yamllint.yml'
18+
- '*.yml'
19+
- '*.yaml'
20+
- '.yamllint'
2021

2122
jobs:
2223
lintSemaphoreYaml:
@@ -26,8 +27,8 @@ jobs:
2627
- id: yaml-lint
2728
uses: ibiqlik/action-yamllint@v3
2829
with:
29-
file_or_dir: .semaphore/**/*.yml
30-
config_file: .semaphore/.yamllint.yml
30+
file_or_dir: ./
31+
config_file: .yamllint
3132
- uses: actions/upload-artifact@v4
3233
if: always()
3334
with:

.yamllint renamed to .yamllint.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
---
22

3-
extends: relaxed
3+
extends: default
44

55
rules:
66
line-length: disable
7+
document-start: disable
8+
truthy: disable
79
indentation:
810
spaces: consistent
911
indent-sequences: consistent
12+
comments:
13+
require-starting-space: false
14+
min-spaces-from-content: 1
15+
comments-indentation: disable
1016

1117
ignore:
1218
# template files are not valid yaml

charts/calico/templates/calico-node-rbac.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ rules:
119119
- get
120120
- list
121121
- watch
122-
# Calico creates some tiers on startup.
122+
# Calico creates some tiers on startup.
123123
- apiGroups: ["crd.projectcalico.org"]
124124
resources:
125125
- tiers

charts/calico/templates/calico-node.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -470,9 +470,9 @@ spec:
470470
# This container runs flannel using the kube-subnet-mgr backend
471471
# for allocating subnets.
472472
- name: kube-flannel
473-
image: {{ .Values.flannel.image }}:{{ .Values.flannel.tag }}
473+
image: {{.Values.flannel.image}}:{{.Values.flannel.tag}}
474474
imagePullPolicy: {{.Values.imagePullPolicy}}
475-
command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
475+
command: ["/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr"]
476476
securityContext:
477477
privileged: true
478478
env:

manifests/calico-bpf.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

manifests/calico-policy-only.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

manifests/calico-typha.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

manifests/calico-vxlan.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

manifests/calico.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

manifests/canal.yaml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

manifests/flannel-migration/calico.yaml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node/tests/k8st/infra/calico-kdd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ rules:
313313
- get
314314
- list
315315
- watch
316-
# Calico creates some tiers on startup.
316+
# Calico creates some tiers on startup.
317317
- apiGroups: ["crd.projectcalico.org"]
318318
resources:
319319
- tiers

process/testing/winfv-cni-plugin/aso/infra/templates/password.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ metadata:
66
type: Opaque
77
data:
88
# Admin password in Base64 format is used by Linux and Windows VMSS manifests. However login with user/password is disabled on Linux.
9-
password: {{ .Env.PASSWORD_BASE64 }}
9+
password: {{.Env.PASSWORD_BASE64}}

process/testing/winfv-cni-plugin/aso/infra/templates/resource-group.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
apiVersion: resources.azure.com/v1api20200601
88
kind: ResourceGroup
99
metadata:
10-
name: {{ .Env.AZURE_RESOURCE_GROUP }}
10+
name: {{.Env.AZURE_RESOURCE_GROUP}}
1111
namespace: winfv
1212
spec:
13-
location: {{ .Env.AZURE_LOCATION }}
13+
location: {{.Env.AZURE_LOCATION}}

process/testing/winfv-cni-plugin/aso/infra/templates/security-group.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
name: winfv-sg
55
namespace: winfv
66
spec:
7-
location: {{ .Env.AZURE_LOCATION }}
7+
location: {{.Env.AZURE_LOCATION}}
88
owner:
9-
name: {{ .Env.AZURE_RESOURCE_GROUP }}
9+
name: {{.Env.AZURE_RESOURCE_GROUP}}
1010

1111
---
1212
apiVersion: network.azure.com/v1api20201101

process/testing/winfv-cni-plugin/aso/infra/templates/vmss-linux.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ metadata:
44
name: vmss-linux
55
namespace: winfv
66
spec:
7-
location: {{ .Env.AZURE_LOCATION }}
7+
location: {{.Env.AZURE_LOCATION}}
88
owner:
9-
name: {{ .Env.AZURE_RESOURCE_GROUP }}
9+
name: {{.Env.AZURE_RESOURCE_GROUP}}
1010
platformFaultDomainCount: 1
1111
singlePlacementGroup: false
1212
sku:
13-
capacity: {{ .Env.LINUX_NODE_COUNT }}
13+
capacity: {{.Env.LINUX_NODE_COUNT}}
1414
name: Standard_D4s_v3
1515
upgradePolicy:
1616
mode: Automatic
@@ -52,7 +52,7 @@ spec:
5252
disablePasswordAuthentication: true
5353
ssh:
5454
publicKeys:
55-
- keyData: {{ .Env.PUBLIC_KEY }}
55+
- keyData: {{.Env.PUBLIC_KEY}}
5656
path: /home/winfv/.ssh/authorized_keys
5757
storageProfile:
5858
imageReference:

process/testing/winfv-cni-plugin/aso/infra/templates/vmss-windows.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ metadata:
44
name: vmss-windows
55
namespace: winfv
66
spec:
7-
location: {{ .Env.AZURE_LOCATION }}
7+
location: {{.Env.AZURE_LOCATION}}
88
owner:
9-
name: {{ .Env.AZURE_RESOURCE_GROUP }}
9+
name: {{.Env.AZURE_RESOURCE_GROUP}}
1010
platformFaultDomainCount: 1
1111
singlePlacementGroup: false
1212
sku:
13-
capacity: {{ .Env.WINDOWS_NODE_COUNT }}
13+
capacity: {{.Env.WINDOWS_NODE_COUNT}}
1414
name: Standard_D4s_v3
1515
upgradePolicy:
1616
mode: Automatic
@@ -51,5 +51,5 @@ spec:
5151
imageReference:
5252
publisher: MicrosoftWindowsServer
5353
offer: WindowsServer
54-
sku: {{ .Env.AZURE_WINDOWS_IMAGE_SKU }}
55-
version: {{ .Env.AZURE_WINDOWS_IMAGE_VERSION }}
54+
sku: {{.Env.AZURE_WINDOWS_IMAGE_SKU}}
55+
version: {{.Env.AZURE_WINDOWS_IMAGE_VERSION}}

process/testing/winfv-cni-plugin/aso/infra/templates/vnet.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ spec:
77
addressSpace:
88
addressPrefixes:
99
- 10.0.0.0/16
10-
location: {{ .Env.AZURE_LOCATION }}
10+
location: {{.Env.AZURE_LOCATION}}
1111
owner:
12-
name: {{ .Env.AZURE_RESOURCE_GROUP }}
12+
name: {{.Env.AZURE_RESOURCE_GROUP}}
1313

1414
---
1515
apiVersion: network.azure.com/v1api20201101

0 commit comments

Comments
 (0)