Skip to content

Commit

Permalink
Included a Makefile target to install yamllint, skipped linting autog…
Browse files Browse the repository at this point in the history
…enerated config dir, fixed linting issues seen
  • Loading branch information
yuanning6 committed Jan 17, 2024
1 parent 92765a2 commit 0c4bfa7
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 23 deletions.
24 changes: 12 additions & 12 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
extends: default

ignore:
- config # Skip autogenerated config dir from liniting

rules:
# Rules to control the number of spaces around operators
braces:
Expand All @@ -17,27 +20,24 @@ rules:
hyphens:
max-spaces-after: 1

# Rules to control indentation
# Rules to control indentation
indentation:
spaces: consistent # Spaces should be consistently used for indentation
indent-sequences: whatever # Either indenting or not indenting individual block sequences is OK
comments-indentation: enable # Comments should be indented the same as the content

# Rules to control lines
# Rules to control lines
line-length:
max: 120 # Maximum 120 characters per line
max: 150 # Maximum 150 characters per line
allow-non-breakable-words: true # Allow long words without breaks
allow-non-breakable-inline-mappings: true # Allow long inline mappings without breaks
empty-lines:
max: 2 # Maximum two consecutive empty lines allowed
trailing-spaces: enable # Ensure no trailing spaces at the end of lines

# Other rules
comments:
min-spaces-from-content: 1 # At least one space required between content and comment
key-duplicates: enable # Ensure no duplicate keys in mappings
document-start:
present: false # Do not require document start marker



# Other rules
comments:
min-spaces-from-content: 1 # At least one space required between content and comment
key-duplicates: enable # Ensure no duplicate keys in mappings
truthy:
allowed-values: ['true', 'false', 'on', 'off'] # Allow only these values for boolean scalars
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@ vet:
help: # Display this help
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n\nTargets:\n"} /^[0-9A-Za-z_-]+:.*?##/ { printf " \033[36m%-45s\033[0m %s\n", $$1, $$2 } /^\$$\([0-9A-Za-z_-]+\):.*?##/ { gsub("_","-", $$1); printf " \033[36m%-45s\033[0m %s\n", tolower(substr($$1, 3, length($$1)-7)), $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

# Install yamllint if not present
.PHONY: install-yamllint
install-yamllint:
@which yamllint > /dev/null || (echo "Installing yamllint..." && pip install yamllint)

## --------------------------------------
## Generate / Manifests
## --------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ releaseSeries:
contract: v1beta1
- major: 0
minor: 7
contract: v1beta1
contract: v1beta1
4 changes: 2 additions & 2 deletions templates/bases/vpc/kcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ spec:
initConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
kubeletExtraArgs:
cloud-provider: external
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
joinConfiguration:
discovery: {}
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
kubeletExtraArgs:
cloud-provider: external
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ spec:
ref:
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-md-0"
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-md-0"
infrastructure:
ref:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: IBMPowerVSMachineTemplate
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-worker-machinetemplate"
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-worker-machinetemplate"
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: IBMPowerVSClusterTemplate
Expand Down
1 change: 0 additions & 1 deletion templates/cluster-template-powervs/kcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ spec:
nodeRegistration:
kubeletExtraArgs:
provider-id: ibmpowervs://${CLUSTER_NAME}/'{{ v1.local_hostname }}'

Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ spec:
initConfiguration:
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
kubeletExtraArgs:
cloud-provider: external
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
joinConfiguration:
discovery: {}
nodeRegistration:
criSocket: /var/run/containerd/containerd.sock
kubeletExtraArgs:
kubeletExtraArgs:
cloud-provider: external
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
1 change: 0 additions & 1 deletion templates/cluster-template/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ metadata:
namespace: "${NAMESPACE}"
labels:
ccm: external

1 change: 0 additions & 1 deletion templates/cluster-template/kcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ spec:
apiServer:
extraArgs:
cloud-provider: external

2 changes: 1 addition & 1 deletion test/e2e/data/cni/calico/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4229,7 +4229,7 @@ rules:
resources:
- endpointslices
verbs:
- watch
- watch
- list
- apiGroups: [""]
resources:
Expand Down

0 comments on commit 0c4bfa7

Please sign in to comment.