Merge pull request #6011 from brooksn/codespell-fix-release-1.23

.github/workflows/spellcheck.yaml

+name: Codespell
+on:
+  push:  
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch: {}
+jobs:
+  spellcheck:
+    name: Spell Check
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 1
+    - name: Set up Python 🐍
+      uses: actions/setup-python@v4
+    - name: Install codespell
+      run: |
+        python -m pip install --upgrade pip
+        pip install codespell
+    - name: Check spelling
+      run: codespell --skip=.git,./scripts,MAINTAINERS,LICENSE,go.mod,go.sum --check-filenames --ignore-words-list=ba
\ No newline at end of file

pkg/secretsencrypt/config.go

@@ -118,7 +118,7 @@ func GenEncryptionConfigHash(runtime *config.ControlRuntime) (string, error) {
 	return hex.EncodeToString(encryptionConfigHash[:]), nil
 }
 
-// GenReencryptHash generates a sha256 hash fom the existing secrets keys and
+// GenReencryptHash generates a sha256 hash from the existing secrets keys and
 // a new key based on the input arguments.
 func GenReencryptHash(runtime *config.ControlRuntime, keyName string) (string, error) {
 

scripts/codespell.sh

-#!/bin/bash
-
-# Ignore vendor folder and check file names as well
-# Note: ignore "ba" in https://github.com/k3s-io/k3s/blob/4317a91/scripts/provision/vagrant#L54
-codespell --skip=.git,./vendor,MAINTAINERS,go.mod,go.sum --check-filenames --ignore-words-list=ba
-
-code=$?
-if [ $code -ne 0 ]; then
-  echo "Error: codespell found one or more problems!"
-  exit $code
-fi

scripts/test

@@ -2,7 +2,6 @@
 set -e -x
 cd $(dirname $0)/..
 
-. ./scripts/codespell.sh
 . ./scripts/version.sh
 . ./scripts/test-helpers
 

tests/TESTING.md

@@ -51,7 +51,7 @@ ___
 
 ## Integration Tests
 
-Integration tests should be used to test a specific functionality of k3s that exists across multiple Go packages, either via exported function calls, or more often, CLI comands.
+Integration tests should be used to test a specific functionality of k3s that exists across multiple Go packages, either via exported function calls, or more often, CLI commands.
 Integration tests should be used for "black box" testing. 
 
 See [integration/README.md](./integration/README.md) for more info.

tests/integration/README.md

 # Integration Tests
 
-Integration tests should be used to test a specific functionality of k3s that exists across multiple Go packages, either via exported function calls, or more often, CLI comands.
+Integration tests should be used to test a specific functionality of k3s that exists across multiple Go packages, either via exported function calls, or more often, CLI commands.
 Integration tests should be used for "black box" testing. 
 
 ## Framework