mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-12-27 02:40:30 +00:00
Merge branch 'origin/main' into 'next-release/main'
This commit is contained in:
oauth
commit
7efb3a8c30
2 changed files with 210 additions and 66 deletions
|
|
@ -1,69 +1,171 @@
|
|||
# Migrations
|
||||
|
||||
Some versions need some changes to the server configuration or the pipeline configuration files. If you are an user check the `User migrations` section of an version. As an admin of a Woodpecker server or agent check the `Admin migrations` section.
|
||||
|
||||
## `next`
|
||||
|
||||
:::info
|
||||
This will be the next version of Woodpecker.
|
||||
:::
|
||||
- No changes
|
||||
|
||||
## User migrations
|
||||
## 3.0.0
|
||||
|
||||
- `gated` has been replaced by `require-approval`
|
||||
- Removed built-in environment variables:
|
||||
- `CI_COMMIT_URL` use `CI_PIPELINE_FORGE_URL`
|
||||
- `CI_STEP_FINISHED` as empty during execution
|
||||
- `CI_PIPELINE_FINISHED` as empty during execution
|
||||
- `CI_PIPELINE_STATUS` was always `success`
|
||||
- `CI_STEP_STATUS` was always `success`
|
||||
- Set `/woodpecker` as default workdir for the **woodpecker-cli** container
|
||||
- Secret filters for plugins now check against tag if specified
|
||||
- Compatibility mode of deprecated `pipeline:`, `platform:` and `branches:` pipeline config options are now removed and pipeline will now fail if still in use.
|
||||
- Removed `steps.[name].group` in favor of `steps.[name].depends_on` (see [workflow syntax](/docs/usage/workflow-syntax#depends_on) to learn how to set dependencies)
|
||||
- Pipelines without a config file will now be skipped instead of failing
|
||||
- Removed `includes` and `excludes` support from **event** filter
|
||||
- Removed upper-casing all secret env vars, instead, the value of the `secrets` property is used. [Read more](/docs/usage/secrets#usage)
|
||||
- Removed alternative names for secrets, use `environment` with `from_secret`
|
||||
- Removed `environment` filter, use `when.evaluate`
|
||||
- Removed `WOODPECKER_WEBHOOK_HOST` in favor of `WOODPECKER_EXPERT_WEBHOOK_HOST`
|
||||
- Renamed `start_time`, `end_time`, `created_at`, `started_at`, `finished_at` and `reviewed_at` JSON fields to `started`, `finished`, `created`, `started`, `finished`, `reviewed`
|
||||
- JSON field `trusted` on repo model was changed from boolean to object
|
||||
- Update all webhooks by pressing the "Repair all" button in the admin settings as the webhook token claims have changed
|
||||
- Crons now use standard Linux syntax without seconds
|
||||
- Removed old API routes: `registry/` -> `registries`, `/authorize/token`
|
||||
- Replaced `registry` command with `repo registry` in cli
|
||||
- Deprecated `secrets`, use `environment` with `from_secret`
|
||||
- Empty string environment variables are not set
|
||||
- CLI commands got restructured to provide a simplified structure:
|
||||
- `woodpecker-cli secret [add|rm|...] --global` is now `woodpecker-cli admin secret [add|rm|...]`
|
||||
- `woodpecker-cli user` is now `woodpecker-cli admin user`
|
||||
- `woodpecker-cli log-level` is now `woodpecker-cli admin log-level`
|
||||
- `woodpecker-cli secret [add|rm|...] --organization` is now `woodpecker-cli org secret [add|rm|...]`
|
||||
- `woodpecker-cli deploy` is now `woodpecker-cli pipeline deploy`
|
||||
- `woodpecker-cli log` is now `woodpecker-cli pipeline log`
|
||||
- `woodpecker-cli cron` is now `woodpecker-cli repo cron`
|
||||
- `woodpecker-cli secret [add|rm|...] --repository` is now `woodpecker-cli repo secret [add|rm|...]`
|
||||
- `woodpecker-cli pipeline logs` is now `woodpecker-cli pipeline log show`
|
||||
- `woodpecker-cli [registry|secret|...] info` is now `woodpecker-cli [registry|secret|...] show`
|
||||
- Dropped native Let's Encrypt certificate support. You can either generate Let's Encrypt certificates externally and use `WOODPECKER_SERVER_CERT` and `WOODPECKER_SERVER_KEY` or use Woodpecker behind a reverse proxy like Caddy.
|
||||
### User-facing migrations
|
||||
|
||||
## Admin migrations
|
||||
#### Security
|
||||
|
||||
- The "gated" option, which restricted which pipelines can start right away without requiring approval, has been replaced by "require-approval" option. Even though this feature ([#3348](https://github.com/woodpecker-ci/woodpecker/pull/3348)) was backported to 2.8, no default is explicitly set.
|
||||
The new default in 3.0 is to require approval only for forked repositories.
|
||||
This allows easier management of dependency bots and other trusted entities having write access to the repository.
|
||||
|
||||
#### Environment variables
|
||||
|
||||
- Environment variables must now be defined as maps. List definitions are disallowed. ([#4016](https://github.com/woodpecker-ci/woodpecker/pull/4016))
|
||||
|
||||
2.x:
|
||||
|
||||
```yaml
|
||||
environment:
|
||||
- ENV1=value1
|
||||
```
|
||||
|
||||
3.x:
|
||||
|
||||
```yaml
|
||||
environment:
|
||||
ENV1: value1
|
||||
```
|
||||
|
||||
The following built-in environment variables have been removed/replaced:
|
||||
|
||||
- `CI_COMMIT_URL` has been deprecated in favor of `CI_PIPELINE_FORGE_URL`
|
||||
- `CI_STEP_FINISHED` as it was empty during execution
|
||||
- `CI_PIPELINE_FINISHED` as it was empty during execution
|
||||
- `CI_PIPELINE_STATUS` due to always being set to `success`
|
||||
- `CI_STEP_STATUS` due to always being set to `success`
|
||||
- `WOODPECKER_WEBHOOK_HOST` in favor of `WOODPECKER_EXPERT_WEBHOOK_HOST`
|
||||
|
||||
Environment variables which are empty after workflow parsing are not being injected into the build but filtered out beforehand ([#4193](https://github.com/woodpecker-ci/woodpecker/pull/4193))
|
||||
|
||||
#### Former deprecations
|
||||
|
||||
The following syntax deprecations will now result in an error:
|
||||
|
||||
- `pipeline:` ([#3916](https://github.com/woodpecker-ci/woodpecker/pull/3916))
|
||||
- `platform:` ([#3916](https://github.com/woodpecker-ci/woodpecker/pull/3916))
|
||||
- `branches:` ([#3916](https://github.com/woodpecker-ci/woodpecker/pull/3916))
|
||||
|
||||
#### Workflow syntax changes
|
||||
|
||||
- Grouping of steps via `steps.[name].group` should now be done using `steps.[name].depends_on`
|
||||
- The `includes` and `excludes` event filter options have been removed
|
||||
- Previously, env vars have been automatically sanitized to uppercase.
|
||||
As this has been confusing, the type-case of the secret definition is now respected ([#3375](https://github.com/woodpecker-ci/woodpecker/pull/3375)).
|
||||
- `secrets` have been entirely removed in favor of `environment` combined with the `from_secret` syntax.
|
||||
As `secrets` are just normal env vars which are masked, the goal was to allow them to be declared next to normal env vars and at the same time reduce the keyword syntax count.
|
||||
Additionally, the `from_secret` syntax gives more flexibility in naming.
|
||||
Whereas beforehand `secrets` where always named after their initial secret name, the `from_secret` reference can now be different.
|
||||
Last, one can inject multiple different env vars from the same secret reference.
|
||||
|
||||
2.x:
|
||||
|
||||
```yaml
|
||||
secrets: [my_token]
|
||||
```
|
||||
|
||||
3.x:
|
||||
|
||||
```yaml
|
||||
environment:
|
||||
MY_TOKEN:
|
||||
from_secret: my_token
|
||||
```
|
||||
|
||||
- The `environment` filter option has been removed in favor of `when.evaluate`
|
||||
|
||||
#### API changes
|
||||
|
||||
- Removed deprecated `registry/` endpoint. Use `registries`, `/authorize/token`
|
||||
|
||||
#### CLI changes
|
||||
|
||||
The following restructuring was done to achieve a more consistent grouping:
|
||||
|
||||
| Old Command | New Command |
|
||||
| ------------------------------------------- | ------------------------------------------- |
|
||||
| `woodpecker-cli registry` | `woodpecker-cli repo registry` |
|
||||
| `woodpecker-cli secret --global` | `woodpecker-cli admin secret` |
|
||||
| `woodpecker-cli user` | `woodpecker-cli admin user` |
|
||||
| `woodpecker-cli log-level` | `woodpecker-cli admin log-level` |
|
||||
| `woodpecker-cli secret --organization` | `woodpecker-cli org secret` |
|
||||
| `woodpecker-cli deploy` | `woodpecker-cli pipeline deploy` |
|
||||
| `woodpecker-cli log` | `woodpecker-cli pipeline log` |
|
||||
| `woodpecker-cli cron` | `woodpecker-cli repo cron` |
|
||||
| `woodpecker-cli secret --repository` | `woodpecker-cli repo secret` |
|
||||
| `woodpecker-cli pipeline logs` | `woodpecker-cli pipeline log show` |
|
||||
| `woodpecker-cli (registry,secret,...) info` | `woodpecker-cli (registry,secret,...) show` |
|
||||
|
||||
#### Miscellaneous
|
||||
|
||||
- For `woodpecker-cli` containers, `/woodpecker` has been set as the default `workdir`
|
||||
|
||||
- Plugin filters for secrets (in the "secrets" repo settings) can now validate against tags.
|
||||
Additionally, the description has been updated to reflect that these filters only apply to plugins ([#4069](https://github.com/woodpecker-ci/woodpecker/pull/4069)).
|
||||
|
||||
- SDK changes:
|
||||
|
||||
- The SDK fields `start_time`, `end_time`, `created_at`, `started_at`, `finished_at` and `reviewed_at` have been renamed to `started`, `finished`, `created`, `started`, `finished`, `reviewed` ([#3968](https://github.com/woodpecker-ci/woodpecker/pull/3968))
|
||||
- The `trusted` field of the repo model was changed from `boolean` to `object`
|
||||
|
||||
- CRON definitions now use standard Linux syntax without seconds.
|
||||
All custom CRON definitions which do not use keywords such as `@daily` or `@weekly` must be updated.
|
||||
|
||||
Example definition for a CRON job running at 8 am daily:
|
||||
|
||||
2.x:
|
||||
|
||||
```sh
|
||||
0 0 8 * * *
|
||||
```
|
||||
|
||||
3.x:
|
||||
|
||||
```sh
|
||||
0 8 * * *
|
||||
```
|
||||
|
||||
- Native Let's Encrypt certificate support has been dropped as it was almost unused and causing frequent issues.
|
||||
Let's Encrypt needs to be set up standalone now. The SSL key pair can still be used in `WOODPECKER_SERVER_CERT` and `WOODPECKER_SERVER_KEY` as an alternative to using a reverse proxy for TLS termination.
|
||||
|
||||
### Admin-facing migrations
|
||||
|
||||
- Previously, some (official) plugins were granted the `privileged` option by default to allow simplified usage.
|
||||
To streamline this process and enhance security transparency, no plugin is granted the `privileged` options by default anymore.
|
||||
To allow the use of these plugins in >= 3.0, they must be set explicitly through `WOODPECKER_PLUGINS_PRIVILEGED` on the admin side.
|
||||
This change mainly impacts the use of the `woodpeckerci/plugin-docker-buildx` plugin, which now will not work anymore unless explicitly listed through this env var ([#4053](https://github.com/woodpecker-ci/woodpecker/pull/4053))
|
||||
|
||||
- Environment variable deprecations:
|
||||
|
||||
| Deprecated Variable | New Variable |
|
||||
| -------------------------------- | ------------------------------------ |
|
||||
| `WOODPECKER_LOG_XORM` | `WOODPECKER_DATABASE_LOG` |
|
||||
| `WOODPECKER_LOG_XORM_SQL` | `WOODPECKER_DATABASE_LOG_SQL` |
|
||||
| `WOODPECKER_FILTER_LABELS` | `WOODPECKER_AGENT_LABELS` |
|
||||
| `WOODPECKER_ESCALATE` | `WOODPECKER_PLUGINS_PRIVILEGED` |
|
||||
| `WOODPECKER_DEFAULT_CLONE_IMAGE` | `WOODPECKER_DEFAULT_CLONE_PLUGIN` |
|
||||
| `WOODPECKER_DEV_OAUTH_HOST` | `WOODPECKER_EXPERT_FORGE_OAUTH_HOST` |
|
||||
| `WOODPECKER_DEV_GITEA_OAUTH_URL` | `WOODPECKER_EXPERT_FORGE_OAUTH_HOST` |
|
||||
| `WOODPECKER_ROOT_PATH` | `WOODPECKER_HOST` |
|
||||
| `WOODPECKER_ROOT_URL` | `WOODPECKER_HOST` |
|
||||
|
||||
- The resource limit settings for the "docker" backend were moved from the server into agent configuration.
|
||||
This allows setting limits on an agent-level which allows greater resource definition granularity ([#3174](https://github.com/woodpecker-ci/woodpecker/pull/3174))
|
||||
|
||||
- "Kubernetes" backend: previously the image pull secret name was hard-coded to `regcred`.
|
||||
To allow more flexibility and specifying multiple pull secrets, the default has been removed.
|
||||
Image pull secrets must now be set explicitly via env var `WOODPECKER_BACKEND_K8S_PULL_SECRET_NAMES` ([#4005](https://github.com/woodpecker-ci/woodpecker/pull/4005))
|
||||
|
||||
- Webhook signatures now use the `rfc9421` protocol
|
||||
|
||||
- Deprecate `WOODPECKER_LOG_XORM` and `WOODPECKER_LOG_XORM_SQL` use `"WOODPECKER_DATABASE_LOG` and `"WOODPECKER_DATABASE_LOG_SQL`
|
||||
- Deprecate `WOODPECKER_FILTER_LABELS` use `WOODPECKER_AGENT_LABELS`
|
||||
- Move docker resource limit settings from server into agent configuration
|
||||
- Rename server environment variable `WOODPECKER_ESCALATE` to `WOODPECKER_PLUGINS_PRIVILEGED`
|
||||
- All default privileged plugins (like `woodpeckerci/plugin-docker-buildx`) were removed. Please carefully [re-add those plugins](/docs/next/administration/server-config#woodpecker_plugins_privileged) you trust and rely on.
|
||||
- `WOODPECKER_DEFAULT_CLONE_IMAGE` got deprecated use `WOODPECKER_DEFAULT_CLONE_PLUGIN`
|
||||
- Check trusted-clone- and privileged-plugins by image name and tag (if tag is set)
|
||||
- Removed `WOODPECKER_DEV_OAUTH_HOST` and `WOODPECKER_DEV_GITEA_OAUTH_URL` use `WOODPECKER_EXPERT_FORGE_OAUTH_HOST`
|
||||
- Removed `WOODPECKER_ROOT_PATH` and `WOODPECKER_ROOT_URL` config variables. Use `WOODPECKER_HOST` with a path instead
|
||||
- Removed implicitly defined `regcred` image pull secret name. Set it explicitly via `WOODPECKER_BACKEND_K8S_PULL_SECRET_NAMES`
|
||||
- Removed slice definition for env vars
|
||||
- Migrated to rfc9421 for webhook signatures
|
||||
- Replaced `configs` object by `netrc` in external configuration APIs
|
||||
- Disallow upgrades from 1.x, upgrade to 2.x first
|
||||
|
||||
- Upgrading from 1.x versions to 3.x is disallowed, upgrading to 2.x first is required to ensure proper DB migrations
|
||||
|
||||
## 2.7.2
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,11 @@ func setupBitbucket(forge *model.Forge) (forge.Forge, error) {
|
|||
Client: forge.Client,
|
||||
Secret: forge.ClientSecret,
|
||||
}
|
||||
log.Trace().Msgf("Forge (bitbucket) opts: %#v", opts)
|
||||
log.Debug().
|
||||
Bool("client-set", opts.Client != "").
|
||||
Bool("secret-set", opts.Secret != "").
|
||||
Str("type", string(forge.Type)).
|
||||
Msg("setting up forge")
|
||||
return bitbucket.New(opts)
|
||||
}
|
||||
|
||||
|
|
@ -64,7 +68,14 @@ func setupGitea(forge *model.Forge) (forge.Forge, error) {
|
|||
if len(opts.URL) == 0 {
|
||||
return nil, fmt.Errorf("WOODPECKER_GITEA_URL must be set")
|
||||
}
|
||||
log.Trace().Msgf("Forge (gitea) opts: %#v", opts)
|
||||
log.Debug().
|
||||
Str("url", opts.URL).
|
||||
Str("oauth-host", opts.OAuthHost).
|
||||
Bool("skip-verify", opts.SkipVerify).
|
||||
Bool("client-set", opts.Client != "").
|
||||
Bool("secret-set", opts.Secret != "").
|
||||
Str("type", string(forge.Type)).
|
||||
Msg("setting up forge")
|
||||
return gitea.New(opts)
|
||||
}
|
||||
|
||||
|
|
@ -84,18 +95,34 @@ func setupForgejo(forge *model.Forge) (forge.Forge, error) {
|
|||
if len(opts.URL) == 0 {
|
||||
return nil, fmt.Errorf("WOODPECKER_FORGEJO_URL must be set")
|
||||
}
|
||||
log.Trace().Msgf("Forge (forgejo) opts: %#v", opts)
|
||||
log.Debug().
|
||||
Str("url", opts.URL).
|
||||
Str("oauth2-url", opts.OAuth2URL).
|
||||
Bool("skip-verify", opts.SkipVerify).
|
||||
Bool("client-set", opts.Client != "").
|
||||
Bool("secret-set", opts.Secret != "").
|
||||
Str("type", string(forge.Type)).
|
||||
Msg("setting up forge")
|
||||
return forgejo.New(opts)
|
||||
}
|
||||
|
||||
func setupGitLab(forge *model.Forge) (forge.Forge, error) {
|
||||
return gitlab.New(gitlab.Opts{
|
||||
opts := gitlab.Opts{
|
||||
URL: forge.URL,
|
||||
ClientID: forge.Client,
|
||||
ClientSecret: forge.ClientSecret,
|
||||
SkipVerify: forge.SkipVerify,
|
||||
OAuthHost: forge.OAuthHost,
|
||||
})
|
||||
}
|
||||
log.Debug().
|
||||
Str("url", opts.URL).
|
||||
Str("oauth-host", opts.OAuthHost).
|
||||
Bool("skip-verify", opts.SkipVerify).
|
||||
Bool("client-id-set", opts.ClientID != "").
|
||||
Bool("client-secret-set", opts.ClientSecret != "").
|
||||
Str("type", string(forge.Type)).
|
||||
Msg("setting up forge")
|
||||
return gitlab.New(opts)
|
||||
}
|
||||
|
||||
func setupGitHub(forge *model.Forge) (forge.Forge, error) {
|
||||
|
|
@ -118,7 +145,16 @@ func setupGitHub(forge *model.Forge) (forge.Forge, error) {
|
|||
OnlyPublic: publicOnly,
|
||||
OAuthHost: forge.OAuthHost,
|
||||
}
|
||||
log.Trace().Msgf("Forge (github) opts: %#v", opts)
|
||||
log.Debug().
|
||||
Str("url", opts.URL).
|
||||
Str("oauth-host", opts.OAuthHost).
|
||||
Bool("merge-ref", opts.MergeRef).
|
||||
Bool("only-public", opts.OnlyPublic).
|
||||
Bool("skip-verify", opts.SkipVerify).
|
||||
Bool("client-set", opts.Client != "").
|
||||
Bool("secret-set", opts.Secret != "").
|
||||
Str("type", string(forge.Type)).
|
||||
Msg("setting up forge")
|
||||
return github.New(opts)
|
||||
}
|
||||
|
||||
|
|
@ -140,16 +176,22 @@ func setupBitbucketDatacenter(forge *model.Forge) (forge.Forge, error) {
|
|||
Password: gitPassword,
|
||||
OAuthHost: forge.OAuthHost,
|
||||
}
|
||||
log.Trace().Msgf("Forge (bitbucketdatacenter) opts: %#v", opts)
|
||||
log.Debug().
|
||||
Str("url", opts.URL).
|
||||
Str("oauth-host", opts.OAuthHost).
|
||||
Bool("client-id-set", opts.ClientID != "").
|
||||
Bool("client-secret-set", opts.ClientSecret != "").
|
||||
Str("type", string(forge.Type)).
|
||||
Msg("setting up forge")
|
||||
return bitbucketdatacenter.New(opts)
|
||||
}
|
||||
|
||||
func setupAddon(forge *model.Forge) (forge.Forge, error) {
|
||||
executable, ok := forge.AdditionalOptions["executable"].(string)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("missing git-username")
|
||||
return nil, fmt.Errorf("missing addon executable")
|
||||
}
|
||||
|
||||
log.Trace().Msgf("Forge (addon) executable: %#v", executable)
|
||||
log.Debug().Str("executable", executable).Msg("setting up forge")
|
||||
return addon.Load(executable)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue