Skip to content

Commit 9820689

Browse files
chore(deps): bump github.com/distribution/distribution/v3 from 3.0.0-rc.1 to 3.0.0-rc.2 (#578)
Bumps [github.com/distribution/distribution/v3](https://github.com/distribution/distribution) from 3.0.0-rc.1 to 3.0.0-rc.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/distribution/distribution/releases">github.com/distribution/distribution/v3's releases</a>.</em></p> <blockquote> <h2>v3.0.0-rc.2</h2> <p>Welcome to the <code>v3.0.0-rc.2</code> release of registry!</p> <p>This is the second release candidate of registry!</p> <p>See the changelog below for a full list of changes.</p> <h2>Notable changes</h2> <ul> <li>Upgrade Go OpenTelemetry <a href="https://redirect.github.com/distribution/distribution/pull/4508">distribution/distribution#4508</a></li> <li>Add support for mTLS auth <a href="https://redirect.github.com/distribution/distribution/pull/4537">distribution/distribution#4537</a></li> <li>Update Go runtime and Alpine image <a href="https://redirect.github.com/distribution/distribution/pull/4532">distribution/distribution#4532</a></li> </ul> <h2>What's Changed</h2> <ul> <li>build(deps): bump codecov/codecov-action from 4 to 5 by <a href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a href="https://redirect.github.com/distribution/distribution/pull/4508">distribution/distribution#4508</a></li> <li>Upgrade <code>go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp</code> by <a href="https://github.com/krynju"><code>@​krynju</code></a> in <a href="https://redirect.github.com/distribution/distribution/pull/4507">distribution/distribution#4507</a></li> <li>docs: Explain how to configure a list through env variables by <a href="https://github.com/barbu110"><code>@​barbu110</code></a> in <a href="https://redirect.github.com/distribution/distribution/pull/4522">distribution/distribution#4522</a></li> <li>build(deps): bump golang.org/x/crypto from 0.28.0 to 0.31.0 by <a href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a href="https://redirect.github.com/distribution/distribution/pull/4531">distribution/distribution#4531</a></li> <li>update xx to v1.6.1 for compatibility with alpine 3.21 and file 5.46+ by <a href="https://github.com/thaJeztah"><code>@​thaJeztah</code></a> in <a href="https://redirect.github.com/distribution/distribution/pull/4527">distribution/distribution#4527</a></li> <li>chore: Bump alpine image version by <a href="https://github.com/milosgajdos"><code>@​milosgajdos</code></a> in <a href="https://redirect.github.com/distribution/distribution/pull/4532">distribution/distribution#4532</a></li> <li>Update squizzi maintainer email by <a href="https://github.com/squizzi"><code>@​squizzi</code></a> in <a href="https://redirect.github.com/distribution/distribution/pull/4530">distribution/distribution#4530</a></li> <li>feat(configuration): support mtls auth mod by <a href="https://github.com/vitshev"><code>@​vitshev</code></a> in <a href="https://redirect.github.com/distribution/distribution/pull/4537">distribution/distribution#4537</a></li> <li>Prepare for rc2 release by <a href="https://github.com/milosgajdos"><code>@​milosgajdos</code></a> in <a href="https://redirect.github.com/distribution/distribution/pull/4539">distribution/distribution#4539</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/krynju"><code>@​krynju</code></a> made their first contribution in <a href="https://redirect.github.com/distribution/distribution/pull/4507">distribution/distribution#4507</a></li> <li><a href="https://github.com/barbu110"><code>@​barbu110</code></a> made their first contribution in <a href="https://redirect.github.com/distribution/distribution/pull/4522">distribution/distribution#4522</a></li> <li><a href="https://github.com/squizzi"><code>@​squizzi</code></a> made their first contribution in <a href="https://redirect.github.com/distribution/distribution/pull/4530">distribution/distribution#4530</a></li> <li><a href="https://github.com/vitshev"><code>@​vitshev</code></a> made their first contribution in <a href="https://redirect.github.com/distribution/distribution/pull/4537">distribution/distribution#4537</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/distribution/distribution/compare/v3.0.0-rc.1...v3.0.0-rc.2">https://github.com/distribution/distribution/compare/v3.0.0-rc.1...v3.0.0-rc.2</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/distribution/distribution/commit/4890d9e03616d563083fa944aaa083cc49b54ff5"><code>4890d9e</code></a> Prepare for rc2 release (<a href="https://redirect.github.com/distribution/distribution/issues/4539">#4539</a>)</li> <li><a href="https://github.com/distribution/distribution/commit/c4a604465f5fe41280126eb837b99a340539ca2e"><code>c4a6044</code></a> Prepare for rc2 release</li> <li><a href="https://github.com/distribution/distribution/commit/1c628981442961ee349bf7c9d1a576fab2bdbe67"><code>1c62898</code></a> feat(configuration): support mtls auth mod (<a href="https://redirect.github.com/distribution/distribution/issues/4537">#4537</a>)</li> <li><a href="https://github.com/distribution/distribution/commit/41a906f0c670b5bdc7f5fc9d00f02219a5d4532b"><code>41a906f</code></a> fix(configuration): replace string literals with constants in tests</li> <li><a href="https://github.com/distribution/distribution/commit/96c9a85b62ee6ffbe7df85b6fb95f054e6a6399b"><code>96c9a85</code></a> fix(configuration): replace string literals with constants in error</li> <li><a href="https://github.com/distribution/distribution/commit/328f802b8e87ae1f6bd8319be2f427e588043397"><code>328f802</code></a> fix(configuration): replace string literals with constants</li> <li><a href="https://github.com/distribution/distribution/commit/916bdeae94f200d85603a9dcec2fa1bb22b755a8"><code>916bdea</code></a> feat(configuration): support mtls auth mod</li> <li><a href="https://github.com/distribution/distribution/commit/258144d70f2718d4b4086e937621cff3e8cd18e4"><code>258144d</code></a> Update squizzi maintainer email (<a href="https://redirect.github.com/distribution/distribution/issues/4530">#4530</a>)</li> <li><a href="https://github.com/distribution/distribution/commit/3241bc213cdf67ba53dfc5e7033549ff6e0d37ab"><code>3241bc2</code></a> chore: Bump alpine image version (<a href="https://redirect.github.com/distribution/distribution/issues/4532">#4532</a>)</li> <li><a href="https://github.com/distribution/distribution/commit/96a3daafe907ac077d695358359f76b743410eef"><code>96a3daa</code></a> Move a direct dependency to direct deps required modules</li> <li>Additional commits viewable in <a href="https://github.com/distribution/distribution/compare/v3.0.0-rc.1...v3.0.0-rc.2">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/distribution/distribution/v3&package-manager=go_modules&previous-version=3.0.0-rc.1&new-version=3.0.0-rc.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hilmar Falkenberg <[email protected]>
1 parent c0a9241 commit 9820689

File tree

74 files changed

+115
-394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+115
-394
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,4 @@ hack/cert-manager.yaml
4848

4949
transport-archive
5050
gen/
51+
/.project

.reuse/dep5

Lines changed: 0 additions & 29 deletions
This file was deleted.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM docker.io/library/golang:1.22.4 as builder
2+
FROM docker.io/library/golang:1.23.5 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
# SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Gardener contributors.
2-
#
3-
# SPDX-License-Identifier: Apache-2.0
4-
51
# Image URL to use all building/pushing image targets
62
IMG ?= ghcr.io/open-component-model/ocm-controller
73
TAG ?= v0.11.0
@@ -74,7 +70,7 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
7470

7571
.PHONY: generate
7672
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
77-
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..." paths="./controllers/..."
73+
$(CONTROLLER_GEN) object paths="./api/..." paths="./controllers/..."
7874

7975
tidy: ## Run go mod tidy
8076
rm -f go.sum; go mod tidy
@@ -89,7 +85,7 @@ vet: ## Run go vet against code.
8985

9086
.PHONY: lint
9187
lint: golangci-lint ## Run golangci-lint.
92-
$(GOLANGCI_LINT) run
88+
$(GOLANGCI_LINT) run --timeout 10m
9389

9490
##@ Testing
9591

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
This is the main repository for `ocm-controller`. The `ocm-controller` is designed to enable the automated deployment of software using the [Open Component Model](https://ocm.software) and Flux.
66

77
It has the following features:
8+
89
- Resolves [`ComponentDescriptor`](https://github.com/open-component-model/ocm-spec/blob/ed97a6a924f514c78acfe29ee7973ed91b0ddba0/doc/glossary.md#component-descriptor) metadata for a particular [component version](https://github.com/open-component-model/ocm-spec/blob/ed97a6a924f514c78acfe29ee7973ed91b0ddba0/doc/glossary.md#component-version)
910
- Performs authentication with [OCM repositories](https://github.com/open-component-model/ocm-spec/blob/ed97a6a924f514c78acfe29ee7973ed91b0ddba0/doc/glossary.md#component-descriptor#component-repository)
1011
- Retrieves [artifacts](https://github.com/open-component-model/ocm-spec/blob/ed97a6a924f514c78acfe29ee7973ed91b0ddba0/doc/glossary.md#artifact) from OCM repositories
@@ -97,7 +98,7 @@ spec:
9798

9899
Apply the `FluxDeployer`:
99100

100-
```
101+
```bash
101102
kubectl apply -f deployer.yaml
102103
```
103104

@@ -427,7 +428,7 @@ The other way is using the provided helm chart for the project under `./deploy`
427428

428429
To do this, use the following command:
429430

430-
```
431+
```bash
431432
helm install ocm-controller oci://ghcr.io/open-component-model/helm/ocm-controller --version v0.25.3
432433
```
433434

@@ -440,12 +441,12 @@ Again, there are two ways to uninstall the controller. Using the ocm cli run `oc
440441

441442
With helm, run:
442443

443-
```
444+
```bash
444445
helm uninstall ocm-controller
445446
```
446447

447448
## Licensing
448449

449-
Copyright 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
450+
Copyright 2025 SAP SE or an SAP affiliate company and Open Component Model contributors.
450451
Please see our [LICENSE](LICENSE) for copyright and license information.
451452
Detailed information including third-party components and their licensing/copyright information is available [via the REUSE tool](https://api.reuse.software/info/github.com/open-component-model/ocm-controller).

REUSE.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version = 1
2+
SPDX-PackageName = "ocm-controller"
3+
SPDX-PackageSupplier = "[email protected]"
4+
SPDX-PackageDownloadLocation = "https://github.com/open-component-model/ocm-controller"
5+
SPDX-PackageComment = "The code in this project may include calls to APIs (\"API Calls\") of\n SAP or third-party products or services developed outside of this project\n (\"External Products\").\n \"APIs\" means application programming interfaces, as well as their respective\n specifications and implementing code that allows software to communicate with\n other software.\n API Calls to External Products are not licensed under the open source license\n that governs this project. The use of such API Calls and related External\n Products are subject to applicable additional agreements with the relevant\n provider of the External Products. In no event shall the open source license\n that governs this project grant any rights in or to any External Products, or\n alter, expand or supersede any terms of the applicable additional agreements.\n If you have a valid license agreement with SAP for the use of a particular SAP\n External Product, then you may make use of any API Calls included in this\n project's code for that SAP External Product, subject to the terms of such\n license agreement. If you do not have a valid license agreement for the use of\n a particular SAP External Product, then you may only make use of any API Calls\n in this project for that SAP External Product for your internal, non-productive\n and non-commercial test and evaluation of such API Calls. Nothing herein grants\n you any rights to use or access any SAP External Product, or provide any third\n parties the right to use of access any SAP External Product, through API Calls."
6+
7+
[[annotations]]
8+
path = "**"
9+
precedence = "aggregate"
10+
SPDX-FileCopyrightText = "2025 SAP SE or an SAP affiliate company and Open Component Model contributors"
11+
SPDX-License-Identifier = "Apache-2.0"

api/v1alpha1/componentdescriptor_types.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
2-
//
3-
// SPDX-License-Identifier: Apache-2.0
4-
51
package v1alpha1
62

73
import (

api/v1alpha1/componentversion_types.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
2-
//
3-
// SPDX-License-Identifier: Apache-2.0
4-
51
package v1alpha1
62

73
import (

api/v1alpha1/condition_types.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
2-
//
3-
// SPDX-License-Identifier: Apache-2.0
4-
51
package v1alpha1
62

73
const (

api/v1alpha1/configuration_types.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
2-
//
3-
// SPDX-License-Identifier: Apache-2.0
4-
51
//nolint:dupl // these are separated for a reason
62
package v1alpha1
73

0 commit comments

Comments
 (0)