diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a2065a3f1..59af816f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ chance to try to fix the issue before it is exploited in the wild. ## Helm v3 and v4 -Helm v4 is currently under development on the `main` branch. During the development of Helm v4 and for some time after its release, Helm v3 will continue to be supported and developed on the `dev-v3` branch. Helm v3 will continue to get bug fixes and updates for new Kubernetes releases. Helm v4 is where new features and major changes will happen. For features to be backported to Helm v3, an exception will be needed. Bugs should first be fixed on Helm v4 and then backported to Helm v3. +Helm v4 is currently under development on the `main` branch. During the development of Helm v4 and for some time after it is released, Helm v3 will continue to be supported and developed on the `dev-v3` branch. Helm v3 will continue to get bug fixes and updates for new Kubernetes releases. Helm v4 is where new features and major changes will happen. For features to be backported to Helm v3, an exception will be needed. Bugs should first be fixed on Helm v4 and then backported to Helm v3. ## Sign Your Work diff --git a/internal/chart/v3/lint/rules/testdata/malformed-template/values.yaml b/internal/chart/v3/lint/rules/testdata/malformed-template/values.yaml index 3d17ff80d..1cc3182ea 100644 --- a/internal/chart/v3/lint/rules/testdata/malformed-template/values.yaml +++ b/internal/chart/v3/lint/rules/testdata/malformed-template/values.yaml @@ -57,8 +57,8 @@ ingress: # - chart-example.local resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious choice - # for the user. This also increases chances charts run on environments with little + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following # lines, adjust them as necessary, and remove the curly braces after 'resources:'. # limits: