diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e809e7ca2..a2065a3f1 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 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. +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. ## Sign Your Work @@ -158,7 +158,7 @@ There are 5 types of issues (each with their own corresponding [label](#labels)) for future reference. Generally these are questions that are too complex or large to store in the Slack channel or have particular interest to the community as a whole. Depending on the discussion, these can turn into `feature` or `bug` issues. -- `proposal`: Used for items (like this one) that propose a new ideas or functionality that require +- `proposal`: Used for items (like this one) that propose new ideas or functionality that require a larger community discussion. This allows for feedback from others in the community before a feature is actually developed. This is not needed for small additions. Final word on whether a feature needs a proposal is up to the core maintainers. All issues that are proposals should 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 1cc3182ea..3d17ff80d 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: diff --git a/internal/chart/v3/lint/rules/testdata/v3-fail/values.yaml b/internal/chart/v3/lint/rules/testdata/v3-fail/values.yaml index 01d99b4e6..8c9b8222a 100644 --- a/internal/chart/v3/lint/rules/testdata/v3-fail/values.yaml +++ b/internal/chart/v3/lint/rules/testdata/v3-fail/values.yaml @@ -48,8 +48,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: diff --git a/pkg/chart/v2/lint/rules/testdata/malformed-template/values.yaml b/pkg/chart/v2/lint/rules/testdata/malformed-template/values.yaml index 1cc3182ea..3d17ff80d 100644 --- a/pkg/chart/v2/lint/rules/testdata/malformed-template/values.yaml +++ b/pkg/chart/v2/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: diff --git a/pkg/chart/v2/lint/rules/testdata/v3-fail/values.yaml b/pkg/chart/v2/lint/rules/testdata/v3-fail/values.yaml index 01d99b4e6..8c9b8222a 100644 --- a/pkg/chart/v2/lint/rules/testdata/v3-fail/values.yaml +++ b/pkg/chart/v2/lint/rules/testdata/v3-fail/values.yaml @@ -48,8 +48,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: diff --git a/pkg/chart/v2/util/create.go b/pkg/chart/v2/util/create.go index bf572c707..68192e8f3 100644 --- a/pkg/chart/v2/util/create.go +++ b/pkg/chart/v2/util/create.go @@ -218,8 +218,8 @@ httpRoute: # value: v2 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: diff --git a/pkg/cmd/testdata/testcharts/chart-with-lib-dep/values.yaml b/pkg/cmd/testdata/testcharts/chart-with-lib-dep/values.yaml index a0cc07e9e..a05a67596 100644 --- a/pkg/cmd/testdata/testcharts/chart-with-lib-dep/values.yaml +++ b/pkg/cmd/testdata/testcharts/chart-with-lib-dep/values.yaml @@ -30,8 +30,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: diff --git a/pkg/cmd/testdata/testcharts/chart-with-template-lib-archive-dep/values.yaml b/pkg/cmd/testdata/testcharts/chart-with-template-lib-archive-dep/values.yaml index b5474cbbd..814c7a07c 100644 --- a/pkg/cmd/testdata/testcharts/chart-with-template-lib-archive-dep/values.yaml +++ b/pkg/cmd/testdata/testcharts/chart-with-template-lib-archive-dep/values.yaml @@ -30,8 +30,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: diff --git a/pkg/cmd/testdata/testcharts/chart-with-template-lib-dep/values.yaml b/pkg/cmd/testdata/testcharts/chart-with-template-lib-dep/values.yaml index d49955c26..77189a333 100644 --- a/pkg/cmd/testdata/testcharts/chart-with-template-lib-dep/values.yaml +++ b/pkg/cmd/testdata/testcharts/chart-with-template-lib-dep/values.yaml @@ -30,8 +30,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: