diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md
index 522eb4fe24a59d8a8f8018d7df9c55e7acfb7c60..b82cf05f174de7c6e090168f0075d126754de126 100644
--- a/docs/usage/configuration-options.md
+++ b/docs/usage/configuration-options.md
@@ -69,7 +69,7 @@ With the above config:
## additionalBranchPrefix
This value defaults to an empty string, and is typically not necessary.
-Some managers populate this field for historical reasons, for example we use `docker-` for Docker branches, so they may look like `renovate/docker-ubuntu-16.x`.
+Some managers previously populated this field, but they no longer do so by default.
You normally don't need to configure this, but one example where it can be useful is combining with `parentDir` in monorepos to split PRs based on where the package definition is located, e.g.
```json
diff --git a/docs/usage/configuration-templates.md b/docs/usage/configuration-templates.md
index 10911f76f2857fdc5f86947968df6d2dd77eeab1..c239ac69fe898a1f7f10fb4e4521cb6cf5d1acef 100644
--- a/docs/usage/configuration-templates.md
+++ b/docs/usage/configuration-templates.md
@@ -21,8 +21,7 @@ Most users will be happy with the default `branchPrefix` of `renovate/`, but you
Say you don't want the forward slashes, in that case you would use `renovate-` as your `branchPrefix`.
The onboarding PR will always use `renovate/configure`.
-`additionalBranchPrefix` is optional and by default is empty for all JavaScript dependencies.
-We use `docker-` for all Docker updates, branches will look like this: `renovate/docker-ubuntu-16.x`.
+`additionalBranchPrefix` is optional and by default is empty.
`branchTopic` depends on the package manager and upgrade type, so you will see a lot of variety.
This is probably a setting you want to change yourself.
diff --git a/lib/config/presets/index.ts b/lib/config/presets/index.ts
index 356d47782ecccdc07a91545dd9477ff208552abd..7e71fc68e1716fe78839afc06477c9a7f8663fa2 100644
--- a/lib/config/presets/index.ts
+++ b/lib/config/presets/index.ts
@@ -100,6 +100,7 @@ export function parsePreset(input: string): ParsedPreset {
str = str.slice(0, str.indexOf('('));
}
const presetsPackages = [
+ 'compatibility',
'config',
'default',
'docker',
diff --git a/lib/config/presets/internal/compatibility.ts b/lib/config/presets/internal/compatibility.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ce1175f569fb34c88edaf2180d481f6855368544
--- /dev/null
+++ b/lib/config/presets/internal/compatibility.ts
@@ -0,0 +1,24 @@
+import { Preset } from '../types';
+
+export const presets: Record<string, Preset> = {
+ additionalBranchPrefix: {
+ buildkite: {
+ additionalBranchPrefix: 'buildkite-',
+ },
+ cargo: {
+ additionalBranchPrefix: 'rust-',
+ },
+ docker: {
+ additionalBranchPrefix: 'docker-',
+ },
+ homebrew: {
+ additionalBranchPrefix: 'homebrew-',
+ },
+ packageRules: [
+ {
+ matchDatasources: ['helm'],
+ additionalBranchPrefix: 'helm-',
+ },
+ ],
+ },
+};
diff --git a/lib/config/presets/internal/index.ts b/lib/config/presets/internal/index.ts
index fbbdd6a790ede34f5cb46312311934718bc852da..e152b9747e19d7f7caae6fbfb1cb9bb70ec22606 100644
--- a/lib/config/presets/internal/index.ts
+++ b/lib/config/presets/internal/index.ts
@@ -1,4 +1,5 @@
import type { Preset, PresetConfig } from '../types';
+import * as compatibilityPreset from './compatibility';
import * as configPreset from './config';
import * as defaultPreset from './default';
import * as dockerPreset from './docker';
@@ -13,6 +14,7 @@ import * as schedulePreset from './schedule';
import * as workaroundsPreset from './workarounds';
export const groups: Record<string, Record<string, Preset>> = {
+ compatibility: compatibilityPreset.presets,
config: configPreset.presets,
default: defaultPreset.presets,
docker: dockerPreset.presets,
diff --git a/lib/datasource/docker/index.ts b/lib/datasource/docker/index.ts
index 7cc5bc301f6c01a5820f46c40cb02e35dd8d8689..cbc83ef5c5a81c74b569bbbe5e82174e0d903cd2 100644
--- a/lib/datasource/docker/index.ts
+++ b/lib/datasource/docker/index.ts
@@ -26,7 +26,6 @@ export const defaultVersioning = dockerVersioning.id;
export const registryStrategy = 'first';
export const defaultConfig = {
- additionalBranchPrefix: 'docker-',
commitMessageTopic: '{{{depName}}} Docker tag',
major: { enabled: false },
commitMessageExtra:
diff --git a/lib/datasource/helm/index.ts b/lib/datasource/helm/index.ts
index ea1105841ac2d01bc7823c7f0b9774db414027c7..af28e7caee5fbe32acfd6e5c463605095ed3fad3 100644
--- a/lib/datasource/helm/index.ts
+++ b/lib/datasource/helm/index.ts
@@ -17,7 +17,6 @@ export const defaultRegistryUrls = ['https://charts.helm.sh/stable'];
export const registryStrategy = 'first';
export const defaultConfig = {
- additionalBranchPrefix: 'helm-',
commitMessageTopic: 'Helm release {{depName}}',
group: {
commitMessageTopic: '{{{groupName}}} Helm releases',
diff --git a/lib/manager/buildkite/index.ts b/lib/manager/buildkite/index.ts
index a97b1018ed28c4e6a93742ae3ded2deec5f17bb0..d678d7fd3c206dd5298128605dd980241cff8e4d 100644
--- a/lib/manager/buildkite/index.ts
+++ b/lib/manager/buildkite/index.ts
@@ -7,5 +7,4 @@ export const defaultConfig = {
commitMessageTopic: 'buildkite plugin {{depName}}',
commitMessageExtra:
'to {{#if isMajor}}v{{{newMajor}}}{{else}}{{{newValue}}}{{/if}}',
- additionalBranchPrefix: 'buildkite-',
};
diff --git a/lib/manager/cargo/index.ts b/lib/manager/cargo/index.ts
index e18f8527d5244c17f852ef13b128d52b91c4feb2..e91db57470e3be6f3ef7861ba3122a8629258e5c 100644
--- a/lib/manager/cargo/index.ts
+++ b/lib/manager/cargo/index.ts
@@ -10,7 +10,6 @@ export { extractPackageFile, updateArtifacts, language };
export const defaultConfig = {
commitMessageTopic: 'Rust crate {{depName}}',
- additionalBranchPrefix: 'rust-',
fileMatch: ['(^|/)Cargo.toml$'],
versioning: cargoVersioning.id,
rangeStrategy: 'bump',
diff --git a/lib/manager/homebrew/index.ts b/lib/manager/homebrew/index.ts
index 62bb3b08a55d92cd8b369f88cfa48f076d2b3cf2..b45e932cf7f9a7c18759df89214f566560d3b537 100644
--- a/lib/manager/homebrew/index.ts
+++ b/lib/manager/homebrew/index.ts
@@ -3,6 +3,5 @@ export { updateDependency } from './update';
export const defaultConfig = {
commitMessageTopic: 'Homebrew Formula {{depName}}',
- additionalBranchPrefix: 'homebrew-',
fileMatch: ['^Formula/[^/]+[.]rb$'],
};
diff --git a/lib/workers/repository/updates/flatten.ts b/lib/workers/repository/updates/flatten.ts
index 6261b851c88ca9c7b6fc68c284d00dd6fb275f29..7c7ef3008846abd0a55da26c38d24eff374139ee 100644
--- a/lib/workers/repository/updates/flatten.ts
+++ b/lib/workers/repository/updates/flatten.ts
@@ -4,7 +4,6 @@ import {
mergeChildConfig,
} from '../../../config';
import type { RenovateConfig } from '../../../config/types';
-import { LANGUAGE_DOCKER } from '../../../constants/languages';
import { getDefaultConfig } from '../../../datasource';
import { get } from '../../../manager';
import { applyPackageRules } from '../../../util/package-rules';
@@ -27,14 +26,6 @@ export function applyUpdateConfig(input: BranchUpgradeConfig): any {
.replace(/-+/, '-')
.toLowerCase()
: undefined;
- if (
- updateConfig.language === LANGUAGE_DOCKER &&
- /(^|\/)node$/.exec(updateConfig.depName) &&
- updateConfig.depName !== 'calico/node'
- ) {
- updateConfig.additionalBranchPrefix = '';
- updateConfig.depNameSanitized = 'node';
- }
generateBranchName(updateConfig);
return updateConfig;
}