diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml deleted file mode 100644 index f8796c21f..000000000 --- a/.github/dependabot.yaml +++ /dev/null @@ -1,40 +0,0 @@ -version: 2 - -updates: - - package-ecosystem: "gomod" - directory: "/" - labels: ["dependencies"] - schedule: - interval: "monthly" - groups: - go-deps: - patterns: - - "*" - allow: - - dependency-type: "direct" - ignore: - # Cloud SDK are updated manually - - dependency-name: "cloud.google.com/*" - - dependency-name: "github.com/Azure/azure-sdk-for-go/*" - # Kubernetes deps are updated by fluxcd/pkg/runtime - - dependency-name: "k8s.io/*" - - dependency-name: "sigs.k8s.io/*" - - dependency-name: "github.com/go-logr/*" - # OCI deps are updated by fluxcd/pkg/oci - - dependency-name: "github.com/docker/*" - - dependency-name: "github.com/distribution/*" - - dependency-name: "github.com/google/go-containerregistry*" - - dependency-name: "github.com/opencontainers/*" - # Helm deps are updated by fluxcd/pkg/helmtestserver - - dependency-name: "helm.sh/helm/*" - # Flux APIs are updated at release time - - dependency-name: "github.com/fluxcd/source-controller/api" - - package-ecosystem: "github-actions" - directory: "/" - labels: ["area/ci", "dependencies"] - groups: - ci: - patterns: - - "*" - schedule: - interval: "monthly" diff --git a/.github/labels.yaml b/.github/labels.yaml deleted file mode 100644 index 2f3e1d525..000000000 --- a/.github/labels.yaml +++ /dev/null @@ -1,42 +0,0 @@ -# Configuration file to declaratively configure labels -# Ref: https://github.com/EndBug/label-sync#Config-files - -- name: area/bucket - description: Bucket related issues and pull requests - color: '#00b140' -- name: area/git - description: Git related issues and pull requests - color: '#863faf' -- name: area/helm - description: Helm related issues and pull requests - color: '#1673b6' -- name: area/oci - description: OCI related issues and pull requests - color: '#c739ff' -- name: area/storage - description: Storage related issues and pull requests - color: '#4b0082' -- name: backport:release/v1.0.x - description: To be backported to release/v1.0.x - color: '#ffd700' -- name: backport:release/v1.1.x - description: To be backported to release/v1.1.x - color: '#ffd700' -- name: backport:release/v1.2.x - description: To be backported to release/v1.2.x - color: '#ffd700' -- name: backport:release/v1.3.x - description: To be backported to release/v1.3.x - color: '#ffd700' -- name: backport:release/v1.4.x - description: To be backported to release/v1.4.x - color: '#ffd700' -- name: backport:release/v1.5.x - description: To be backported to release/v1.5.x - color: '#ffd700' -- name: backport:release/v1.6.x - description: To be backported to release/v1.6.x - color: '#ffd700' -- name: backport:release/v1.7.x - description: To be backported to release/v1.7.x - color: '#ffd700' diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml deleted file mode 100644 index f67e6a946..000000000 --- a/.github/workflows/backport.yaml +++ /dev/null @@ -1,12 +0,0 @@ -name: backport -on: - pull_request_target: - types: [closed, labeled] -jobs: - backport: - permissions: - contents: write # for reading and creating branches. - pull-requests: write # for creating pull requests against release branches. - uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.4.0 - secrets: - github-token: ${{ secrets.BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/cifuzz.yaml b/.github/workflows/cifuzz.yaml deleted file mode 100644 index 16ddaa227..000000000 --- a/.github/workflows/cifuzz.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: fuzz -on: - pull_request: - branches: - - 'main' - - 'release/**' -jobs: - smoketest: - runs-on: ubuntu-latest - permissions: - contents: read # for reading the repository code. - steps: - - name: Test suite setup - uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.4.0 - with: - go-version: 1.25.x - - name: Smoke test Fuzzers - run: make fuzz-smoketest - env: - SKIP_COSIGN_VERIFICATION: true diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml deleted file mode 100644 index 483e65ad6..000000000 --- a/.github/workflows/e2e.yaml +++ /dev/null @@ -1,35 +0,0 @@ -name: e2e -on: - workflow_dispatch: - pull_request: - push: - branches: - - 'main' - - 'release/**' -jobs: - kind-linux-amd64: - runs-on: ubuntu-latest - permissions: - contents: read # for reading the repository code. - steps: - - name: Test suite setup - uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.4.0 - with: - go-version: 1.25.x - - name: Verify - run: make verify - - name: Enable integration tests - # Only run integration tests for main and release branches - if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') - run: | - echo 'GO_TAGS=integration' >> $GITHUB_ENV - - name: Run E2E tests - env: - SKIP_COSIGN_VERIFICATION: true - CREATE_CLUSTER: false - run: make e2e - - name: Print controller logs - if: always() - continue-on-error: true - run: | - kubectl -n source-system logs -l app=source-controller diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9cc8d6e17..17506a140 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -2,65 +2,50 @@ name: release on: push: tags: - - 'v*' + - "v*" workflow_dispatch: inputs: tag: - description: 'image tag prefix' - default: 'rc' + description: "image tag prefix" + default: "rc" required: true jobs: - release: + _: + runs-on: ubuntu-latest permissions: - contents: write # for creating the GitHub release. - id-token: write # for creating OIDC tokens for signing. - packages: write # for pushing and signing container images. - uses: fluxcd/gha-workflows/.github/workflows/controller-release.yaml@v0.4.0 - with: - controller: ${{ github.event.repository.name }} - release-candidate-prefix: ${{ github.event.inputs.tag }} - secrets: - github-token: ${{ secrets.GITHUB_TOKEN }} - dockerhub-token: ${{ secrets.DOCKER_FLUXCD_PASSWORD }} - release-provenance: - needs: [release] - permissions: - actions: read # for detecting the Github Actions environment. - id-token: write # for creating OIDC tokens for signing. - contents: write # for uploading attestations to GitHub releases. - if: startsWith(github.ref, 'refs/tags/v') - uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.1.0 - with: - provenance-name: "provenance.intoto.jsonl" - base64-subjects: "${{ needs.release.outputs.release-digests }}" - upload-assets: true - dockerhub-provenance: - needs: [release] - permissions: - contents: read # for reading the repository code. - actions: read # for detecting the Github Actions environment. - id-token: write # for creating OIDC tokens for signing. - packages: write # for uploading attestations. - if: startsWith(github.ref, 'refs/tags/v') - uses: slsa-framework/slsa-github-generator/.github/workflows/generator_container_slsa3.yml@v2.1.0 - with: - image: ${{ needs.release.outputs.image-name }} - digest: ${{ needs.release.outputs.image-digest }} - registry-username: ${{ github.repository_owner == 'fluxcd' && 'fluxcdbot' || github.repository_owner }} - secrets: - registry-password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }} - ghcr-provenance: - needs: [release] - permissions: - contents: read # for reading the repository code. - actions: read # for detecting the Github Actions environment. - id-token: write # for creating OIDC tokens for signing. - packages: write # for uploading attestations. - if: startsWith(github.ref, 'refs/tags/v') - uses: slsa-framework/slsa-github-generator/.github/workflows/generator_container_slsa3.yml@v2.1.0 - with: - image: ghcr.io/${{ needs.release.outputs.image-name }} - digest: ${{ needs.release.outputs.image-digest }} - registry-username: fluxcdbot # not necessary for ghcr.io - secrets: - registry-password: ${{ secrets.GITHUB_TOKEN }} + contents: write + steps: + - name: Checkout + uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 + - name: Setup Kustomize + uses: fluxcd/pkg/actions/kustomize@62ddfc16c29b86028b855f5b999329c6abca4207 + - name: Prepare + id: prep + env: + GIT_REF: ${{ github.ref }} + GIT_SHA: ${{ github.sha }} + RELEASE_CANDIDATE_PREFIX: ${{ github.event.inputs.tag }} + run: | + VERSION="${RELEASE_CANDIDATE_PREFIX}-${GIT_SHA::8}" + if [[ $GIT_REF == refs/tags/* ]]; then + VERSION=${GIT_REF/refs\/tags\//} + fi + echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT + echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT + - name: Generate release artifacts + if: startsWith(github.ref, 'refs/tags/v') + env: + CONTROLLER: ${{ github.event.repository.name }} + run: | + mkdir -p config/release + kustomize build ./config/crd > ./config/release/${CONTROLLER}.crds.yaml + kustomize build ./config/manager > ./config/release/${CONTROLLER}.deployment.yaml + - name: Create release + id: run-goreleaser + if: startsWith(github.ref, 'refs/tags/v') + uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0 + with: + version: latest + args: release --clean --skip=validate + env: + GITHUB_TOKEN: ${{ secrets.github-token }} diff --git a/.github/workflows/scan.yaml b/.github/workflows/scan.yaml deleted file mode 100644 index ea8e992de..000000000 --- a/.github/workflows/scan.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: scan -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - schedule: - - cron: '18 10 * * 3' -jobs: - analyze: - permissions: - contents: read # for reading the repository code. - security-events: write # for uploading the CodeQL analysis results. - uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.4.0 - secrets: - github-token: ${{ secrets.GITHUB_TOKEN }} - fossa-token: ${{ secrets.FOSSA_TOKEN }} diff --git a/.github/workflows/sync-labels.yaml b/.github/workflows/sync-labels.yaml deleted file mode 100644 index a4635094d..000000000 --- a/.github/workflows/sync-labels.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: sync-labels -on: - workflow_dispatch: - push: - branches: - - main - paths: - - .github/labels.yaml -jobs: - sync-labels: - permissions: - contents: read # for reading the labels file. - issues: write # for creating and updating labels. - uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.4.0 - secrets: - github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml deleted file mode 100644 index c7a9aa2e8..000000000 --- a/.github/workflows/test.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: test -on: - workflow_dispatch: - pull_request: - push: - branches: - - 'main' - - 'release/**' -jobs: - test-linux-amd64: - runs-on: ubuntu-latest - steps: - - name: Test suite setup - uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.4.0 - with: - go-version: 1.25.x - - name: Run tests - env: - SKIP_COSIGN_VERIFICATION: true - TEST_AZURE_ACCOUNT_NAME: ${{ secrets.TEST_AZURE_ACCOUNT_NAME }} - TEST_AZURE_ACCOUNT_KEY: ${{ secrets.TEST_AZURE_ACCOUNT_KEY }} - run: make test diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 7b61ce0c1..07eec438f 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,4 +1,4 @@ -project_name: source-controller +project_name: nelm-source-controller builds: - skip: true @@ -10,17 +10,13 @@ release: header: | ## Changelog - [{{.Tag}} changelog](https://github.com/fluxcd/{{.ProjectName}}/blob/{{.Tag}}/CHANGELOG.md) + [{{.Tag}} changelog](https://github.com/werf/{{.ProjectName}}/blob/{{.Tag}}/CHANGELOG.md) footer: | ## Container images - - - `docker.io/fluxcd/{{.ProjectName}}:{{.Tag}}` - - `ghcr.io/fluxcd/{{.ProjectName}}:{{.Tag}}` - + + - `registry.werf.io/nelm/source-controller:{{.Tag}}` + Supported architectures: `linux/amd64`, `linux/arm64` and `linux/arm/v7`. - - The container images are built on GitHub hosted runners and are signed with cosign and GitHub OIDC. - To verify the images and their provenance (SLSA level 3), please see the [security documentation](https://fluxcd.io/flux/security/). changelog: disable: true @@ -32,26 +28,3 @@ checksum: source: enabled: true name_template: "{{ .ProjectName }}_{{ .Version }}_source_code" - -sboms: - - id: source - artifacts: source - documents: - - "{{ .ProjectName }}_{{ .Version }}_sbom.spdx.json" - -# signs the checksum file -# all files (including the sboms) are included in the checksum -# https://goreleaser.com/customization/sign -signs: - - cmd: cosign - env: - - COSIGN_EXPERIMENTAL=1 - certificate: "${artifact}.pem" - args: - - sign-blob - - "--yes" - - "--output-certificate=${certificate}" - - "--output-signature=${signature}" - - "${artifact}" - artifacts: checksum - output: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 814b9ec5a..8cb190212 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,7 +66,7 @@ This minor release comes with new features, improvements and bug fixes. ### ExternalArtifact -A new [ExternalArtifact](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1/externalartifacts.md) API has been added to the `source.toolkit.fluxcd.io` group. This API enables advanced source composition and decomposition patterns implemented by the [source-watcher](https://github.com/fluxcd/source-watcher) controller. +A new [ExternalArtifact](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1/externalartifacts.md) API has been added to the `source.werf.io` group. This API enables advanced source composition and decomposition patterns implemented by the [source-watcher](https://github.com/fluxcd/source-watcher) controller. ### GitRepository @@ -114,7 +114,7 @@ Improvements: [#1870](https://github.com/fluxcd/source-controller/pull/1870) - Extract storage operations to a dedicated package [#1864](https://github.com/fluxcd/source-controller/pull/1864) -- Remove deprecated APIs in group `source.toolkit.fluxcd.io/v1beta1` +- Remove deprecated APIs in group `source.werf.io/v1beta1` [#1861](https://github.com/fluxcd/source-controller/pull/1861) - Migrate tests from gotest to gomega [#1876](https://github.com/fluxcd/source-controller/pull/1876) @@ -381,7 +381,7 @@ For `HelmRepository` of type `oci`, the `.spec.insecure` field allows connecting over HTTP to an insecure non-TLS container registry. To upgrade from `v1beta2`, after deploying the new CRD and controller, -set `apiVersion: source.toolkit.fluxcd.io/v1` in the YAML files that +set `apiVersion: source.werf.io/v1` in the YAML files that contain `HelmRepository` definitions. Bumping the API version in manifests can be done gradually. It is advised not to delay this procedure as the beta versions will be removed after 6 months. @@ -416,7 +416,7 @@ Helm v3.14.4, and various other dependencies to their latest version to patch upstream CVEs. Improvements: -- Promote Helm APIs to `source.toolkit.fluxcd.io/v1` (GA) +- Promote Helm APIs to `source.werf.io/v1` (GA) [#1428](https://github.com/fluxcd/source-controller/pull/1428) - Add `.spec.ignoreMissingValuesFiles` to HelmChart API [#1447](https://github.com/fluxcd/source-controller/pull/1447) @@ -899,7 +899,7 @@ The `GitRepository` kind was promoted from v1beta2 to v1 (GA) and deprecated fie The common types `Artifact`, `Conditions` and the `Source` interface were promoted to v1. -The `gitrepositories.source.toolkit.fluxcd.io` CRD contains the following versions: +The `gitrepositories.source.werf.io` CRD contains the following versions: - v1 (storage version) - v1beta2 (deprecated) - v1beta1 (deprecated) @@ -914,7 +914,7 @@ The `GitRepository` v1 API is backwards compatible with v1beta2, except for the - the `.status.url` was removed in favor of the absolute `.status.artifact.url` To upgrade from v1beta2, after deploying the new CRD and controller, -set `apiVersion: source.toolkit.fluxcd.io/v1` in the YAML files that +set `apiVersion: source.werf.io/v1` in the YAML files that contain `GitRepository` definitions and remove the deprecated fields if any. Bumping the API version in manifests can be done gradually. It is advised to not delay this procedure as the beta versions will be removed after 6 months. @@ -941,7 +941,7 @@ labels applied to work as expected. ### Full changelog Improvements: -- GA: Promote `GitRepository` API to `source.toolkit.fluxcd.io/v1` +- GA: Promote `GitRepository` API to `source.werf.io/v1` [#1056](https://github.com/fluxcd/source-controller/pull/1056) - Add reconciler sharding capability based on label selector [#1059](https://github.com/fluxcd/source-controller/pull/1059) @@ -1926,7 +1926,7 @@ Introduction of a secure directory loader which improves the handling of Helm charts paths. Improvements: -- update toolkit.fluxcd.io docs links +- update werf.io docs links [#651](https://github.com/fluxcd/source-controller/pull/651) - Add optional in-memory cache of HelmRepository index files [#626](https://github.com/fluxcd/source-controller/pull/626) @@ -2003,7 +2003,7 @@ Fixes: This prerelease ensures (Kubernetes) Event annotations are prefixed with the FQDN of the Source API Group. For example, `revision` is now -`source.toolkit.fluxcd.io/revision`. +`source.werf.io/revision`. This to facilitate improvements to the notification-controller, where annotations prefixed with the FQDN of the Group of the Involved Object will be @@ -2128,7 +2128,7 @@ widely tested. ### API changes -The `source.toolkit.fluxcd.io/v1beta2` API is backwards compatible with `v1beta1`. +The `source.werf.io/v1beta2` API is backwards compatible with `v1beta1`. - Introduction of `Reconciling` and `Stalled` Condition types for [better integration with `kstatus`](https://github.com/kubernetes-sigs/cli-utils/blob/master/pkg/kstatus/README.md#conditions). @@ -3118,7 +3118,7 @@ and a histogram with the reconciliation duration in seconds: **Release date:** 2020-09-30 This is the first MINOR prerelease, it promotes the -`source.toolkit.fluxcd.io` API to `v1beta1` and removes support for +`source.werf.io` API to `v1beta1` and removes support for `v1alpha1`. Going forward, changes to the API will be accompanied by a conversion @@ -3230,7 +3230,7 @@ and it's possible to configure the timeout of index downloads. **Release date:** 2020-07-31 This prerelease comes with a breaking change, the -CRDs group has been renamed to `source.toolkit.fluxcd.io`. +CRDs group has been renamed to `source.werf.io`. ## 0.0.6 diff --git a/Makefile b/Makefile index 28226af5d..2b9093be6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Image URL to use all building/pushing image targets -IMG ?= fluxcd/source-controller +IMG ?= registry.werf.io/nelm/source-controller TAG ?= latest # Allows for defining additional Go test args, e.g. '-tags integration'. @@ -214,7 +214,7 @@ fuzz-smoketest: fuzz-build bash -c "/runner.sh" # Run fuzz tests for the duration set in FUZZ_TIME. -fuzz-native: +fuzz-native: KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) \ FUZZ_TIME=$(FUZZ_TIME) \ ./tests/fuzz/native_go_run.sh diff --git a/PROJECT b/PROJECT index 9d89d81be..24bc7163a 100644 --- a/PROJECT +++ b/PROJECT @@ -1,4 +1,4 @@ -domain: toolkit.fluxcd.io +domain: werf.io repo: github.com/fluxcd/source-controller resources: - group: source diff --git a/README.md b/README.md index 6f07b2e00..48d43d167 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The source-controller is a Kubernetes operator, specialised in artifacts acquisition from external sources such as Git, OCI, Helm repositories and S3-compatible buckets. The source-controller implements the -[source.toolkit.fluxcd.io](docs/spec/README.md) API +[source.werf.io](docs/spec/README.md) API and is a core component of the [GitOps toolkit](https://fluxcd.io/flux/components/). ![overview](docs/diagrams/source-controller-overview.png) @@ -18,11 +18,11 @@ and is a core component of the [GitOps toolkit](https://fluxcd.io/flux/component | Kind | API Version | |----------------------------------------------------|-------------------------------| -| [GitRepository](docs/spec/v1/gitrepositories.md) | `source.toolkit.fluxcd.io/v1` | -| [OCIRepository](docs/spec/v1/ocirepositories.md) | `source.toolkit.fluxcd.io/v1` | -| [HelmRepository](docs/spec/v1/helmrepositories.md) | `source.toolkit.fluxcd.io/v1` | -| [HelmChart](docs/spec/v1/helmcharts.md) | `source.toolkit.fluxcd.io/v1` | -| [Bucket](docs/spec/v1/buckets.md) | `source.toolkit.fluxcd.io/v1` | +| [GitRepository](docs/spec/v1/gitrepositories.md) | `source.werf.io/v1` | +| [OCIRepository](docs/spec/v1/ocirepositories.md) | `source.werf.io/v1` | +| [HelmRepository](docs/spec/v1/helmrepositories.md) | `source.werf.io/v1` | +| [HelmChart](docs/spec/v1/helmcharts.md) | `source.werf.io/v1` | +| [Bucket](docs/spec/v1/buckets.md) | `source.werf.io/v1` | ## Features diff --git a/api/go.mod b/api/go.mod index e8f7d0f1f..512204917 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,4 +1,4 @@ -module github.com/fluxcd/source-controller/api +module github.com/werf/nelm-source-controller/api go 1.25.0 @@ -10,22 +10,30 @@ require ( ) require ( + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/fxamacker/cbor/v2 v2.9.0 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kr/pretty v0.3.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect + github.com/onsi/ginkgo/v2 v2.25.2 // indirect + github.com/onsi/gomega v1.38.2 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/rogpeppe/go-internal v1.14.1 // indirect + github.com/spf13/pflag v1.0.10 // indirect + github.com/stretchr/testify v1.11.1 // indirect github.com/x448/float16 v0.8.4 // indirect - go.yaml.in/yaml/v2 v2.4.2 // indirect - golang.org/x/net v0.45.0 // indirect - golang.org/x/text v0.29.0 // indirect + go.yaml.in/yaml/v2 v2.4.3 // indirect + golang.org/x/net v0.47.0 // indirect + golang.org/x/text v0.31.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/inf.v0 v0.9.1 // indirect + k8s.io/api v0.34.2 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect - sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect + k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect + sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect ) diff --git a/api/go.sum b/api/go.sum index 024d2e9b5..526128b7f 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,7 +1,9 @@ -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= +github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fluxcd/pkg/apis/acl v0.9.0 h1:wBpgsKT+jcyZEcM//OmZr9RiF8klL3ebrDp2u2ThsnA= github.com/fluxcd/pkg/apis/acl v0.9.0/go.mod h1:TttNS+gocsGLwnvmgVi3/Yscwqrjc17+vhgYfqkfrV4= github.com/fluxcd/pkg/apis/meta v1.23.0 h1:fLis5YcHnOsyKYptzBtituBm5EWNx13I0bXQsy0FG4s= @@ -17,8 +19,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= -github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 h1:xhMrHhTJ6zxu3gA4enFM9MLn9AY7613teCdFnlUVbSQ= +github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -36,28 +38,31 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8= github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg= -github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= -github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw= -github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/onsi/ginkgo/v2 v2.25.2 h1:hepmgwx1D+llZleKQDMEvy8vIlCxMGt7W5ZxDjIEhsw= +github.com/onsi/ginkgo/v2 v2.25.2/go.mod h1:43uiyQC4Ed2tkOzLsEYm7hnrb7UJTWHYNsuy3bG/snE= +github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A= +github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= -github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= -github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= -github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= -go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= +go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs= +go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8= +go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= +go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -67,26 +72,26 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= -golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= +golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= +golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= -golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= -golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= +golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= +golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= -golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= +golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ= +golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -98,18 +103,18 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM= -k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk= +k8s.io/api v0.34.2 h1:fsSUNZhV+bnL6Aqrp6O7lMTy6o5x2C4XLjnh//8SLYY= +k8s.io/api v0.34.2/go.mod h1:MMBPaWlED2a8w4RSeanD76f7opUoypY8TFYkSM+3XHw= k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4= k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y= -k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck= +k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A= sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8= -sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= -sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= +sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= +sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco= diff --git a/api/v1/doc.go b/api/v1/doc.go index a06b2174b..766289009 100644 --- a/api/v1/doc.go +++ b/api/v1/doc.go @@ -16,5 +16,5 @@ limitations under the License. // Package v1 contains API Schema definitions for the source v1 API group // +kubebuilder:object:generate=true -// +groupName=source.toolkit.fluxcd.io +// +groupName=source.werf.io package v1 diff --git a/api/v1/groupversion_info.go b/api/v1/groupversion_info.go index b539a7947..871d94aa2 100644 --- a/api/v1/groupversion_info.go +++ b/api/v1/groupversion_info.go @@ -23,7 +23,7 @@ import ( var ( // GroupVersion is group version used to register these objects. - GroupVersion = schema.GroupVersion{Group: "source.toolkit.fluxcd.io", Version: "v1"} + GroupVersion = schema.GroupVersion{Group: "source.werf.io", Version: "v1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme. SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} diff --git a/api/v1/source.go b/api/v1/source.go index d879f6034..949d51820 100644 --- a/api/v1/source.go +++ b/api/v1/source.go @@ -32,7 +32,7 @@ const ( // Source interface must be supported by all API types. // Source is the interface that provides generic access to the Artifact and -// interval. It must be supported by all kinds of the source.toolkit.fluxcd.io +// interval. It must be supported by all kinds of the source.werf.io // API group. // // +k8s:deepcopy-gen=false diff --git a/api/v1beta1/doc.go b/api/v1beta1/doc.go index f604a2624..7ba5b05d0 100644 --- a/api/v1beta1/doc.go +++ b/api/v1beta1/doc.go @@ -19,5 +19,5 @@ limitations under the License. // Deprecated: v1beta1 is no longer supported, use v1 instead. // // +kubebuilder:object:generate=true -// +groupName=source.toolkit.fluxcd.io +// +groupName=source.werf.io package v1beta1 diff --git a/api/v1beta1/groupversion_info.go b/api/v1beta1/groupversion_info.go index 57c51fff6..1a34d8e62 100644 --- a/api/v1beta1/groupversion_info.go +++ b/api/v1beta1/groupversion_info.go @@ -23,7 +23,7 @@ import ( var ( // GroupVersion is group version used to register these objects. - GroupVersion = schema.GroupVersion{Group: "source.toolkit.fluxcd.io", Version: "v1beta1"} + GroupVersion = schema.GroupVersion{Group: "source.werf.io", Version: "v1beta1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme. SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} diff --git a/api/v1beta2/bucket_types.go b/api/v1beta2/bucket_types.go index 6495abdd0..9c8434a69 100644 --- a/api/v1beta2/bucket_types.go +++ b/api/v1beta2/bucket_types.go @@ -24,7 +24,7 @@ import ( "github.com/fluxcd/pkg/apis/acl" "github.com/fluxcd/pkg/apis/meta" - apiv1 "github.com/fluxcd/source-controller/api/v1" + apiv1 "github.com/werf/nelm-source-controller/api/v1" ) const ( diff --git a/api/v1beta2/doc.go b/api/v1beta2/doc.go index e9fca1650..0d19f901c 100644 --- a/api/v1beta2/doc.go +++ b/api/v1beta2/doc.go @@ -16,5 +16,5 @@ limitations under the License. // Package v1beta2 contains API Schema definitions for the source v1beta2 API group // +kubebuilder:object:generate=true -// +groupName=source.toolkit.fluxcd.io +// +groupName=source.werf.io package v1beta2 diff --git a/api/v1beta2/groupversion_info.go b/api/v1beta2/groupversion_info.go index 797e6c536..a66b64ed5 100644 --- a/api/v1beta2/groupversion_info.go +++ b/api/v1beta2/groupversion_info.go @@ -23,7 +23,7 @@ import ( var ( // GroupVersion is group version used to register these objects. - GroupVersion = schema.GroupVersion{Group: "source.toolkit.fluxcd.io", Version: "v1beta2"} + GroupVersion = schema.GroupVersion{Group: "source.werf.io", Version: "v1beta2"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme. SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} diff --git a/api/v1beta2/helmchart_types.go b/api/v1beta2/helmchart_types.go index ac24b1c13..d3b7dacfd 100644 --- a/api/v1beta2/helmchart_types.go +++ b/api/v1beta2/helmchart_types.go @@ -24,7 +24,7 @@ import ( "github.com/fluxcd/pkg/apis/acl" "github.com/fluxcd/pkg/apis/meta" - apiv1 "github.com/fluxcd/source-controller/api/v1" + apiv1 "github.com/werf/nelm-source-controller/api/v1" ) // HelmChartKind is the string representation of a HelmChart. diff --git a/api/v1beta2/ocirepository_types.go b/api/v1beta2/ocirepository_types.go index 760f0d8f1..8c6e34ab6 100644 --- a/api/v1beta2/ocirepository_types.go +++ b/api/v1beta2/ocirepository_types.go @@ -23,7 +23,7 @@ import ( "github.com/fluxcd/pkg/apis/meta" - apiv1 "github.com/fluxcd/source-controller/api/v1" + apiv1 "github.com/werf/nelm-source-controller/api/v1" ) const ( diff --git a/api/v1beta2/source.go b/api/v1beta2/source.go index 4111c0998..464feabde 100644 --- a/api/v1beta2/source.go +++ b/api/v1beta2/source.go @@ -30,7 +30,7 @@ const ( // Source interface must be supported by all API types. // Source is the interface that provides generic access to the Artifact and -// interval. It must be supported by all kinds of the source.toolkit.fluxcd.io +// interval. It must be supported by all kinds of the source.werf.io // API group. // // Deprecated: use the Source interface from api/v1 instead. This type will be diff --git a/api/v1beta2/zz_generated.deepcopy.go b/api/v1beta2/zz_generated.deepcopy.go index 0b874dd7e..063309cf0 100644 --- a/api/v1beta2/zz_generated.deepcopy.go +++ b/api/v1beta2/zz_generated.deepcopy.go @@ -23,7 +23,7 @@ package v1beta2 import ( "github.com/fluxcd/pkg/apis/acl" "github.com/fluxcd/pkg/apis/meta" - apiv1 "github.com/fluxcd/source-controller/api/v1" + apiv1 "github.com/werf/nelm-source-controller/api/v1" "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/config/crd/bases/source.toolkit.fluxcd.io_buckets.yaml b/config/crd/bases/source.werf.io_buckets.yaml similarity index 99% rename from config/crd/bases/source.toolkit.fluxcd.io_buckets.yaml rename to config/crd/bases/source.werf.io_buckets.yaml index f578c8da0..41d6e3b02 100644 --- a/config/crd/bases/source.toolkit.fluxcd.io_buckets.yaml +++ b/config/crd/bases/source.werf.io_buckets.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 - name: buckets.source.toolkit.fluxcd.io + name: buckets.source.werf.io spec: - group: source.toolkit.fluxcd.io + group: source.werf.io names: kind: Bucket listKind: BucketList diff --git a/config/crd/bases/source.toolkit.fluxcd.io_externalartifacts.yaml b/config/crd/bases/source.werf.io_externalartifacts.yaml similarity index 99% rename from config/crd/bases/source.toolkit.fluxcd.io_externalartifacts.yaml rename to config/crd/bases/source.werf.io_externalartifacts.yaml index 23cdf63c3..5c054be39 100644 --- a/config/crd/bases/source.toolkit.fluxcd.io_externalartifacts.yaml +++ b/config/crd/bases/source.werf.io_externalartifacts.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 - name: externalartifacts.source.toolkit.fluxcd.io + name: externalartifacts.source.werf.io spec: - group: source.toolkit.fluxcd.io + group: source.werf.io names: kind: ExternalArtifact listKind: ExternalArtifactList diff --git a/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml b/config/crd/bases/source.werf.io_gitrepositories.yaml similarity index 99% rename from config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml rename to config/crd/bases/source.werf.io_gitrepositories.yaml index 10663e473..028160b11 100644 --- a/config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml +++ b/config/crd/bases/source.werf.io_gitrepositories.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 - name: gitrepositories.source.toolkit.fluxcd.io + name: gitrepositories.source.werf.io spec: - group: source.toolkit.fluxcd.io + group: source.werf.io names: kind: GitRepository listKind: GitRepositoryList diff --git a/config/crd/bases/source.toolkit.fluxcd.io_helmcharts.yaml b/config/crd/bases/source.werf.io_helmcharts.yaml similarity index 99% rename from config/crd/bases/source.toolkit.fluxcd.io_helmcharts.yaml rename to config/crd/bases/source.werf.io_helmcharts.yaml index 50237f713..83fbebffc 100644 --- a/config/crd/bases/source.toolkit.fluxcd.io_helmcharts.yaml +++ b/config/crd/bases/source.werf.io_helmcharts.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 - name: helmcharts.source.toolkit.fluxcd.io + name: helmcharts.source.werf.io spec: - group: source.toolkit.fluxcd.io + group: source.werf.io names: kind: HelmChart listKind: HelmChartList diff --git a/config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml b/config/crd/bases/source.werf.io_helmrepositories.yaml similarity index 99% rename from config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml rename to config/crd/bases/source.werf.io_helmrepositories.yaml index 750a36500..3afc6df20 100644 --- a/config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml +++ b/config/crd/bases/source.werf.io_helmrepositories.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 - name: helmrepositories.source.toolkit.fluxcd.io + name: helmrepositories.source.werf.io spec: - group: source.toolkit.fluxcd.io + group: source.werf.io names: kind: HelmRepository listKind: HelmRepositoryList diff --git a/config/crd/bases/source.toolkit.fluxcd.io_ocirepositories.yaml b/config/crd/bases/source.werf.io_ocirepositories.yaml similarity index 99% rename from config/crd/bases/source.toolkit.fluxcd.io_ocirepositories.yaml rename to config/crd/bases/source.werf.io_ocirepositories.yaml index 05b7b96ab..9a2412a2d 100644 --- a/config/crd/bases/source.toolkit.fluxcd.io_ocirepositories.yaml +++ b/config/crd/bases/source.werf.io_ocirepositories.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 - name: ocirepositories.source.toolkit.fluxcd.io + name: ocirepositories.source.werf.io spec: - group: source.toolkit.fluxcd.io + group: source.werf.io names: kind: OCIRepository listKind: OCIRepositoryList diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 2a09dbfd5..06d8178ed 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -1,10 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- bases/source.toolkit.fluxcd.io_gitrepositories.yaml -- bases/source.toolkit.fluxcd.io_helmrepositories.yaml -- bases/source.toolkit.fluxcd.io_helmcharts.yaml -- bases/source.toolkit.fluxcd.io_buckets.yaml -- bases/source.toolkit.fluxcd.io_ocirepositories.yaml -- bases/source.toolkit.fluxcd.io_externalartifacts.yaml +- bases/source.werf.io_gitrepositories.yaml +- bases/source.werf.io_helmrepositories.yaml +- bases/source.werf.io_helmcharts.yaml +- bases/source.werf.io_buckets.yaml +- bases/source.werf.io_ocirepositories.yaml +- bases/source.werf.io_externalartifacts.yaml # +kubebuilder:scaffold:crdkustomizeresource diff --git a/config/manager/deployment.yaml b/config/manager/deployment.yaml index e354b00e3..116d26431 100644 --- a/config/manager/deployment.yaml +++ b/config/manager/deployment.yaml @@ -1,20 +1,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: source-controller + name: nelm-source-controller labels: control-plane: controller spec: selector: matchLabels: - app: source-controller + app: nelm-source-controller replicas: 1 strategy: type: Recreate template: metadata: labels: - app: source-controller + app: nelm-source-controller annotations: prometheus.io/scrape: "true" prometheus.io/port: "8080" @@ -25,61 +25,61 @@ spec: # https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts-technical-overview.html fsGroup: 1337 containers: - - name: manager - image: fluxcd/source-controller - imagePullPolicy: IfNotPresent - securityContext: - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - runAsNonRoot: true - capabilities: - drop: [ "ALL" ] - seccompProfile: - type: RuntimeDefault - ports: - - containerPort: 9090 - name: http - protocol: TCP - - containerPort: 8080 - name: http-prom - protocol: TCP - - containerPort: 9440 - name: healthz - protocol: TCP - env: - - name: RUNTIME_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: TUF_ROOT # store the Fulcio root CA file in tmp - value: "/tmp/.sigstore" - args: - - --watch-all-namespaces - - --log-level=info - - --log-encoding=json - - --enable-leader-election - - --storage-path=/data - - --storage-adv-addr=source-controller.$(RUNTIME_NAMESPACE).svc.cluster.local. - livenessProbe: - httpGet: - port: healthz - path: /healthz - readinessProbe: - httpGet: - port: http - path: / - resources: - limits: - cpu: 1000m - memory: 1Gi - requests: - cpu: 50m - memory: 64Mi - volumeMounts: - - name: data - mountPath: /data - - name: tmp - mountPath: /tmp + - name: manager + image: registry.werf.io/nelm/source-controller + imagePullPolicy: IfNotPresent + securityContext: + allowPrivilegeEscalation: false + readOnlyRootFilesystem: true + runAsNonRoot: true + capabilities: + drop: ["ALL"] + seccompProfile: + type: RuntimeDefault + ports: + - containerPort: 9090 + name: http + protocol: TCP + - containerPort: 8080 + name: http-prom + protocol: TCP + - containerPort: 9440 + name: healthz + protocol: TCP + env: + - name: RUNTIME_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: TUF_ROOT # store the Fulcio root CA file in tmp + value: "/tmp/.sigstore" + args: + - --watch-all-namespaces + - --log-level=info + - --log-encoding=json + - --enable-leader-election + - --storage-path=/data + - --storage-adv-addr=nelm-source-controller.$(RUNTIME_NAMESPACE).svc.cluster.local. + livenessProbe: + httpGet: + port: healthz + path: /healthz + readinessProbe: + httpGet: + port: http + path: / + resources: + limits: + cpu: 1000m + memory: 1Gi + requests: + cpu: 50m + memory: 64Mi + volumeMounts: + - name: data + mountPath: /data + - name: tmp + mountPath: /tmp volumes: - name: data emptyDir: {} diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 0118ce85b..5889cf77d 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,9 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- service.yaml -- deployment.yaml + - service.yaml + - deployment.yaml images: -- name: fluxcd/source-controller - newName: fluxcd/source-controller - newTag: v1.7.0 + - name: registry.werf.io/nelm/source-controller + newName: registry.werf.io/nelm/source-controller + newTag: v0.1.0 diff --git a/config/manager/service.yaml b/config/manager/service.yaml index 66ee36bd9..3ac4a04c4 100644 --- a/config/manager/service.yaml +++ b/config/manager/service.yaml @@ -1,13 +1,13 @@ apiVersion: v1 kind: Service metadata: - name: source-controller + name: nelm-source-controller labels: control-plane: controller spec: type: ClusterIP selector: - app: source-controller + app: nelm-source-controller ports: - name: http port: 80 diff --git a/config/rbac/bucket_editor_role.yaml b/config/rbac/bucket_editor_role.yaml index 63d2229a7..4d577782d 100644 --- a/config/rbac/bucket_editor_role.yaml +++ b/config/rbac/bucket_editor_role.yaml @@ -5,7 +5,7 @@ metadata: name: bucket-editor-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - buckets verbs: @@ -17,7 +17,7 @@ rules: - update - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - buckets/status verbs: diff --git a/config/rbac/bucket_viewer_role.yaml b/config/rbac/bucket_viewer_role.yaml index f8033a28f..d4cc52e9d 100644 --- a/config/rbac/bucket_viewer_role.yaml +++ b/config/rbac/bucket_viewer_role.yaml @@ -5,7 +5,7 @@ metadata: name: bucket-viewer-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - buckets verbs: @@ -13,7 +13,7 @@ rules: - list - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - buckets/status verbs: diff --git a/config/rbac/externalartifact_editor_role.yaml b/config/rbac/externalartifact_editor_role.yaml index ded6c1d93..469120f3a 100644 --- a/config/rbac/externalartifact_editor_role.yaml +++ b/config/rbac/externalartifact_editor_role.yaml @@ -5,7 +5,7 @@ metadata: name: externalartifact-editor-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - externalartifacts verbs: @@ -17,7 +17,7 @@ rules: - update - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - externalartifacts/status verbs: diff --git a/config/rbac/externalartifact_viewer_role.yaml b/config/rbac/externalartifact_viewer_role.yaml index d0c1d507f..693b5b201 100644 --- a/config/rbac/externalartifact_viewer_role.yaml +++ b/config/rbac/externalartifact_viewer_role.yaml @@ -5,7 +5,7 @@ metadata: name: externalartifacts-viewer-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - externalartifacts verbs: @@ -13,7 +13,7 @@ rules: - list - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - externalartifacts/status verbs: diff --git a/config/rbac/gitrepository_editor_role.yaml b/config/rbac/gitrepository_editor_role.yaml index 221a323e6..7e5b1f7eb 100644 --- a/config/rbac/gitrepository_editor_role.yaml +++ b/config/rbac/gitrepository_editor_role.yaml @@ -5,7 +5,7 @@ metadata: name: gitrepository-editor-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - gitrepositories verbs: @@ -17,7 +17,7 @@ rules: - update - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - gitrepositories/status verbs: diff --git a/config/rbac/gitrepository_viewer_role.yaml b/config/rbac/gitrepository_viewer_role.yaml index 6d4803162..24a74587b 100644 --- a/config/rbac/gitrepository_viewer_role.yaml +++ b/config/rbac/gitrepository_viewer_role.yaml @@ -5,7 +5,7 @@ metadata: name: gitrepository-viewer-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - gitrepositories verbs: @@ -13,7 +13,7 @@ rules: - list - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - gitrepositories/status verbs: diff --git a/config/rbac/helmchart_editor_role.yaml b/config/rbac/helmchart_editor_role.yaml index 0ce40ee5f..f4c1aa4e4 100644 --- a/config/rbac/helmchart_editor_role.yaml +++ b/config/rbac/helmchart_editor_role.yaml @@ -5,7 +5,7 @@ metadata: name: helmchart-editor-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - helmcharts verbs: @@ -17,7 +17,7 @@ rules: - update - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - helmcharts/status verbs: diff --git a/config/rbac/helmchart_viewer_role.yaml b/config/rbac/helmchart_viewer_role.yaml index c39243f6a..9ff9debb5 100644 --- a/config/rbac/helmchart_viewer_role.yaml +++ b/config/rbac/helmchart_viewer_role.yaml @@ -5,7 +5,7 @@ metadata: name: helmchart-viewer-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - helmcharts verbs: @@ -13,7 +13,7 @@ rules: - list - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - helmcharts/status verbs: diff --git a/config/rbac/helmrepository_editor_role.yaml b/config/rbac/helmrepository_editor_role.yaml index 2afb92b4b..e613cc70b 100644 --- a/config/rbac/helmrepository_editor_role.yaml +++ b/config/rbac/helmrepository_editor_role.yaml @@ -5,7 +5,7 @@ metadata: name: helmrepository-editor-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - helmrepositories verbs: @@ -17,7 +17,7 @@ rules: - update - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - helmrepositories/status verbs: diff --git a/config/rbac/helmrepository_viewer_role.yaml b/config/rbac/helmrepository_viewer_role.yaml index 68a3ae49f..06a19e63b 100644 --- a/config/rbac/helmrepository_viewer_role.yaml +++ b/config/rbac/helmrepository_viewer_role.yaml @@ -5,7 +5,7 @@ metadata: name: helmrepository-viewer-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - helmrepositories verbs: @@ -13,7 +13,7 @@ rules: - list - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - helmrepositories/status verbs: diff --git a/config/rbac/ocirepository_editor_role.yaml b/config/rbac/ocirepository_editor_role.yaml index e4defde09..9518aecc2 100644 --- a/config/rbac/ocirepository_editor_role.yaml +++ b/config/rbac/ocirepository_editor_role.yaml @@ -5,7 +5,7 @@ metadata: name: ocirepository-editor-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - ocirepositories verbs: @@ -17,7 +17,7 @@ rules: - update - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - ocirepositories/status verbs: diff --git a/config/rbac/ocirepository_viewer_role.yaml b/config/rbac/ocirepository_viewer_role.yaml index f769ac5a9..7611421e4 100644 --- a/config/rbac/ocirepository_viewer_role.yaml +++ b/config/rbac/ocirepository_viewer_role.yaml @@ -5,7 +5,7 @@ metadata: name: ocirepository-viewer-role rules: - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - ocirepositories verbs: @@ -13,7 +13,7 @@ rules: - list - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - ocirepositories/status verbs: diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index d2cd9e7cb..92656ff04 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -27,7 +27,7 @@ rules: verbs: - create - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - buckets - gitrepositories @@ -43,7 +43,7 @@ rules: - update - watch - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - buckets/finalizers - gitrepositories/finalizers @@ -57,7 +57,7 @@ rules: - patch - update - apiGroups: - - source.toolkit.fluxcd.io + - source.werf.io resources: - buckets/status - gitrepositories/status diff --git a/config/samples/source_v1_bucket.yaml b/config/samples/source_v1_bucket.yaml index f09cbe213..ad1c8d358 100644 --- a/config/samples/source_v1_bucket.yaml +++ b/config/samples/source_v1_bucket.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: bucket-sample diff --git a/config/samples/source_v1_gitrepository.yaml b/config/samples/source_v1_gitrepository.yaml index 27fad9a25..2d9ccb472 100644 --- a/config/samples/source_v1_gitrepository.yaml +++ b/config/samples/source_v1_gitrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: gitrepository-sample diff --git a/config/samples/source_v1_helmchart_gitrepository.yaml b/config/samples/source_v1_helmchart_gitrepository.yaml index 680e7b184..c7a8a08ee 100644 --- a/config/samples/source_v1_helmchart_gitrepository.yaml +++ b/config/samples/source_v1_helmchart_gitrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: helmchart-git-sample diff --git a/config/samples/source_v1_helmchart_helmrepository-oci.yaml b/config/samples/source_v1_helmchart_helmrepository-oci.yaml index d9dd3279d..015e64b02 100644 --- a/config/samples/source_v1_helmchart_helmrepository-oci.yaml +++ b/config/samples/source_v1_helmchart_helmrepository-oci.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: helmchart-sample-oci diff --git a/config/samples/source_v1_helmchart_helmrepository.yaml b/config/samples/source_v1_helmchart_helmrepository.yaml index d1b43fe3e..4fb6ef50b 100644 --- a/config/samples/source_v1_helmchart_helmrepository.yaml +++ b/config/samples/source_v1_helmchart_helmrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: helmchart-sample diff --git a/config/samples/source_v1_helmrepository-oci.yaml b/config/samples/source_v1_helmrepository-oci.yaml index 458dc73c2..a306a3b76 100644 --- a/config/samples/source_v1_helmrepository-oci.yaml +++ b/config/samples/source_v1_helmrepository-oci.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: helmrepository-sample-oci diff --git a/config/samples/source_v1_helmrepository.yaml b/config/samples/source_v1_helmrepository.yaml index b7049cc0a..459cd1baf 100644 --- a/config/samples/source_v1_helmrepository.yaml +++ b/config/samples/source_v1_helmrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: helmrepository-sample diff --git a/config/samples/source_v1_ocirepository.yaml b/config/samples/source_v1_ocirepository.yaml index 69fb19e2a..049d3fb46 100644 --- a/config/samples/source_v1_ocirepository.yaml +++ b/config/samples/source_v1_ocirepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: ocirepository-sample diff --git a/config/testdata/bucket/source.yaml b/config/testdata/bucket/source.yaml index bd3097ee2..f29da0d05 100644 --- a/config/testdata/bucket/source.yaml +++ b/config/testdata/bucket/source.yaml @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: podinfo diff --git a/config/testdata/git/large-repo.yaml b/config/testdata/git/large-repo.yaml index ad3defd68..b52f06c5a 100644 --- a/config/testdata/git/large-repo.yaml +++ b/config/testdata/git/large-repo.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: large-repo diff --git a/config/testdata/helmchart-from-bucket/source.yaml b/config/testdata/helmchart-from-bucket/source.yaml index 814305d13..e69348f44 100644 --- a/config/testdata/helmchart-from-bucket/source.yaml +++ b/config/testdata/helmchart-from-bucket/source.yaml @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: charts @@ -13,7 +13,7 @@ spec: secretRef: name: minio-credentials --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: helmchart-bucket diff --git a/config/testdata/helmchart-from-oci/notation.yaml b/config/testdata/helmchart-from-oci/notation.yaml index 6434479ea..57792eec2 100644 --- a/config/testdata/helmchart-from-oci/notation.yaml +++ b/config/testdata/helmchart-from-oci/notation.yaml @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: podinfo-notation @@ -8,7 +8,7 @@ spec: type: "oci" interval: 1m --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: podinfo-notation diff --git a/config/testdata/helmchart-from-oci/source.yaml b/config/testdata/helmchart-from-oci/source.yaml index b2786531e..48e381cb9 100644 --- a/config/testdata/helmchart-from-oci/source.yaml +++ b/config/testdata/helmchart-from-oci/source.yaml @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: podinfo @@ -8,7 +8,7 @@ spec: type: "oci" interval: 1m --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: podinfo @@ -20,7 +20,7 @@ spec: version: '6.1.*' interval: 1m --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: podinfo-keyless diff --git a/config/testdata/helmchart-valuesfile/gitrepository.yaml b/config/testdata/helmchart-valuesfile/gitrepository.yaml index 279979e93..ee84c93c9 100644 --- a/config/testdata/helmchart-valuesfile/gitrepository.yaml +++ b/config/testdata/helmchart-valuesfile/gitrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: podinfo diff --git a/config/testdata/helmchart-valuesfile/helmchart_gitrepository.yaml b/config/testdata/helmchart-valuesfile/helmchart_gitrepository.yaml index 3c26b3eb5..35faa6bcc 100644 --- a/config/testdata/helmchart-valuesfile/helmchart_gitrepository.yaml +++ b/config/testdata/helmchart-valuesfile/helmchart_gitrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: podinfo-git diff --git a/config/testdata/helmchart-valuesfile/helmchart_helmrepository.yaml b/config/testdata/helmchart-valuesfile/helmchart_helmrepository.yaml index 0b004eb7a..5210b0176 100644 --- a/config/testdata/helmchart-valuesfile/helmchart_helmrepository.yaml +++ b/config/testdata/helmchart-valuesfile/helmchart_helmrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: podinfo diff --git a/config/testdata/helmchart-valuesfile/helmrepository.yaml b/config/testdata/helmchart-valuesfile/helmrepository.yaml index f0c178695..5a09df1c0 100644 --- a/config/testdata/helmchart-valuesfile/helmrepository.yaml +++ b/config/testdata/helmchart-valuesfile/helmrepository.yaml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: podinfo diff --git a/config/testdata/ocirepository/signed-with-key.yaml b/config/testdata/ocirepository/signed-with-key.yaml index 0a3a652ee..b5d12f623 100644 --- a/config/testdata/ocirepository/signed-with-key.yaml +++ b/config/testdata/ocirepository/signed-with-key.yaml @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: podinfo-deploy-signed-with-key diff --git a/config/testdata/ocirepository/signed-with-keyless.yaml b/config/testdata/ocirepository/signed-with-keyless.yaml index ff46ed30d..171fe9011 100644 --- a/config/testdata/ocirepository/signed-with-keyless.yaml +++ b/config/testdata/ocirepository/signed-with-keyless.yaml @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: podinfo-deploy-signed-with-keyless diff --git a/config/testdata/ocirepository/signed-with-notation.yaml b/config/testdata/ocirepository/signed-with-notation.yaml index 55820f6d4..b0cab9ede 100644 --- a/config/testdata/ocirepository/signed-with-notation.yaml +++ b/config/testdata/ocirepository/signed-with-notation.yaml @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: podinfo-deploy-signed-with-notation diff --git a/docs/api/v1/source.md b/docs/api/v1/source.md index 935d74275..0743483cb 100644 --- a/docs/api/v1/source.md +++ b/docs/api/v1/source.md @@ -2,24 +2,24 @@

Packages:

-

source.toolkit.fluxcd.io/v1

+

source.werf.io/v1

Package v1 contains API Schema definitions for the source v1 API group

Resource Types: -

Bucket +

Bucket

Bucket is the Schema for the buckets API.

@@ -37,7 +37,7 @@ Resource Types: apiVersion
string -source.toolkit.fluxcd.io/v1 +source.werf.io/v1 @@ -67,7 +67,7 @@ Refer to the Kubernetes API documentation for the fields of the spec
- + BucketSpec @@ -116,7 +116,7 @@ string sts
- + BucketSTSSpec @@ -299,7 +299,7 @@ Bucket.

status
- + BucketStatus @@ -311,7 +311,7 @@ BucketStatus
-

GitRepository +

GitRepository

GitRepository is the Schema for the gitrepositories API.

@@ -329,7 +329,7 @@ BucketStatus apiVersion
string -source.toolkit.fluxcd.io/v1 +source.werf.io/v1 @@ -359,7 +359,7 @@ Refer to the Kubernetes API documentation for the fields of the spec
- + GitRepositorySpec @@ -457,7 +457,7 @@ Kubernetes meta/v1.Duration ref
- + GitRepositoryRef @@ -472,7 +472,7 @@ changes, defaults to the ‘master’ branch.

verify
- + GitRepositoryVerification @@ -542,7 +542,7 @@ the GitRepository as cloned from the URL, using their default settings.

include
- + []GitRepositoryInclude @@ -574,7 +574,7 @@ Artifact produced for this GitRepository.

status
- + GitRepositoryStatus @@ -586,7 +586,7 @@ GitRepositoryStatus
-

HelmChart +

HelmChart

HelmChart is the Schema for the helmcharts API.

@@ -604,7 +604,7 @@ GitRepositoryStatus apiVersion
string -source.toolkit.fluxcd.io/v1 +source.werf.io/v1 @@ -634,7 +634,7 @@ Refer to the Kubernetes API documentation for the fields of the spec
- + HelmChartSpec @@ -672,7 +672,7 @@ GitRepository and Bucket sources. Defaults to latest when omitted.

sourceRef
- + LocalHelmChartSourceReference @@ -757,7 +757,7 @@ source.

verify
- + OCIRepositoryVerification @@ -778,7 +778,7 @@ Chart dependencies, which are not bundled in the umbrella chart artifact, are no status
- + HelmChartStatus @@ -790,7 +790,7 @@ HelmChartStatus
-

HelmRepository +

HelmRepository

HelmRepository is the Schema for the helmrepositories API.

@@ -808,7 +808,7 @@ HelmChartStatus apiVersion
string -source.toolkit.fluxcd.io/v1 +source.werf.io/v1 @@ -838,7 +838,7 @@ Refer to the Kubernetes API documentation for the fields of the spec
- + HelmRepositorySpec @@ -1031,7 +1031,7 @@ When not specified, defaults to ‘generic’.

status
- + HelmRepositoryStatus @@ -1043,7 +1043,7 @@ HelmRepositoryStatus
-

OCIRepository +

OCIRepository

OCIRepository is the Schema for the ocirepositories API

@@ -1061,7 +1061,7 @@ HelmRepositoryStatus apiVersion
string -source.toolkit.fluxcd.io/v1 +source.werf.io/v1 @@ -1091,7 +1091,7 @@ Refer to the Kubernetes API documentation for the fields of the spec
- + OCIRepositorySpec @@ -1116,7 +1116,7 @@ on a remote container registry.

ref
- + OCIRepositoryRef @@ -1131,7 +1131,7 @@ defaults to the latest tag.

layerSelector
- + OCILayerSelector @@ -1175,7 +1175,7 @@ The secret must be of type kubernetes.io/dockerconfigjson.

verify
- + OCIRepositoryVerification @@ -1315,7 +1315,7 @@ bool status
- + OCIRepositoryStatus @@ -1327,11 +1327,11 @@ OCIRepositoryStatus
-

BucketSTSSpec +

BucketSTSSpec

(Appears on: -BucketSpec) +BucketSpec)

BucketSTSSpec specifies the required configuration to use a Security Token Service for fetching temporary credentials to authenticate in a Bucket @@ -1415,11 +1415,11 @@ be of type Opaque or kubernetes.io/tls.

-

BucketSpec +

BucketSpec

(Appears on: -Bucket) +Bucket)

BucketSpec specifies the required configuration to produce an Artifact for an object storage bucket.

@@ -1473,7 +1473,7 @@ string sts
- + BucketSTSSpec @@ -1653,11 +1653,11 @@ Bucket.

-

BucketStatus +

BucketStatus

(Appears on: -Bucket) +Bucket)

BucketStatus records the observed state of a Bucket.

@@ -1756,7 +1756,7 @@ github.com/fluxcd/pkg/apis/meta.ReconcileRequestStatus
-

ExternalArtifact +

ExternalArtifact

ExternalArtifact is the Schema for the external artifacts API

@@ -1787,7 +1787,7 @@ Refer to the Kubernetes API documentation for the fields of the spec
- + ExternalArtifactSpec @@ -1818,7 +1818,7 @@ which the artifact is generated.

status
- + ExternalArtifactStatus @@ -1830,11 +1830,11 @@ ExternalArtifactStatus
-

ExternalArtifactSpec +

ExternalArtifactSpec

(Appears on: -ExternalArtifact) +ExternalArtifact)

ExternalArtifactSpec defines the desired state of ExternalArtifact

@@ -1866,11 +1866,11 @@ which the artifact is generated.

-

ExternalArtifactStatus +

ExternalArtifactStatus

(Appears on: -ExternalArtifact) +ExternalArtifact)

ExternalArtifactStatus defines the observed state of ExternalArtifact

@@ -1915,12 +1915,12 @@ github.com/fluxcd/pkg/apis/meta.Artifact
-

GitRepositoryInclude +

GitRepositoryInclude

(Appears on: -GitRepositorySpec, -GitRepositoryStatus) +GitRepositorySpec, +GitRepositoryStatus)

GitRepositoryInclude specifies a local reference to a GitRepository which Artifact (sub-)contents must be included, and where they should be placed.

@@ -1978,11 +1978,11 @@ the GitRepositoryRef.

-

GitRepositoryRef +

GitRepositoryRef

(Appears on: -GitRepositorySpec) +GitRepositorySpec)

GitRepositoryRef specifies the Git reference to resolve and checkout.

@@ -2063,11 +2063,11 @@ the commit is expected to exist.

-

GitRepositorySpec +

GitRepositorySpec

(Appears on: -GitRepository) +GitRepository)

GitRepositorySpec specifies the required configuration to produce an Artifact for a Git repository.

@@ -2170,7 +2170,7 @@ Kubernetes meta/v1.Duration ref
- + GitRepositoryRef @@ -2185,7 +2185,7 @@ changes, defaults to the ‘master’ branch.

verify
- + GitRepositoryVerification @@ -2255,7 +2255,7 @@ the GitRepository as cloned from the URL, using their default settings.

include
- + []GitRepositoryInclude @@ -2284,11 +2284,11 @@ Artifact produced for this GitRepository.

-

GitRepositoryStatus +

GitRepositoryStatus

(Appears on: -GitRepository) +GitRepository)

GitRepositoryStatus records the observed state of a Git repository.

@@ -2387,7 +2387,7 @@ configuration used to produce the current Artifact.

observedInclude
- + []GitRepositoryInclude @@ -2415,7 +2415,7 @@ produce the current Artifact.

sourceVerificationMode
- + GitVerificationMode @@ -2445,11 +2445,11 @@ github.com/fluxcd/pkg/apis/meta.ReconcileRequestStatus
-

GitRepositoryVerification +

GitRepositoryVerification

(Appears on: -GitRepositorySpec) +GitRepositorySpec)

GitRepositoryVerification specifies the Git commit signature verification strategy.

@@ -2467,7 +2467,7 @@ strategy.

mode
- + GitVerificationMode @@ -2498,19 +2498,19 @@ authors.

-

GitVerificationMode +

GitVerificationMode (string alias)

(Appears on: -GitRepositoryStatus, -GitRepositoryVerification) +GitRepositoryStatus, +GitRepositoryVerification)

GitVerificationMode specifies the verification mode for a Git repository.

-

HelmChartSpec +

HelmChartSpec

(Appears on: -HelmChart) +HelmChart)

HelmChartSpec specifies the desired state of a Helm chart.

@@ -2552,7 +2552,7 @@ GitRepository and Bucket sources. Defaults to latest when omitted.

sourceRef
- + LocalHelmChartSourceReference @@ -2637,7 +2637,7 @@ source.

verify
- + OCIRepositoryVerification @@ -2655,11 +2655,11 @@ Chart dependencies, which are not bundled in the umbrella chart artifact, are no
-

HelmChartStatus +

HelmChartStatus

(Appears on: -HelmChart) +HelmChart)

HelmChartStatus records the observed state of the HelmChart.

@@ -2786,11 +2786,11 @@ github.com/fluxcd/pkg/apis/meta.ReconcileRequestStatus
-

HelmRepositorySpec +

HelmRepositorySpec

(Appears on: -HelmRepository) +HelmRepository)

HelmRepositorySpec specifies the required configuration to produce an Artifact for a Helm repository index YAML.

@@ -2985,11 +2985,11 @@ When not specified, defaults to ‘generic’.

-

HelmRepositoryStatus +

HelmRepositoryStatus

(Appears on: -HelmRepository) +HelmRepository)

HelmRepositoryStatus records the observed state of the HelmRepository.

@@ -3076,11 +3076,11 @@ github.com/fluxcd/pkg/apis/meta.ReconcileRequestStatus
-

LocalHelmChartSourceReference +

LocalHelmChartSourceReference

(Appears on: -HelmChartSpec) +HelmChartSpec)

LocalHelmChartSourceReference contains enough information to let you locate the typed referenced object at namespace level.

@@ -3133,12 +3133,12 @@ string -

OCILayerSelector +

OCILayerSelector

(Appears on: -OCIRepositorySpec, -OCIRepositoryStatus) +OCIRepositorySpec, +OCIRepositoryStatus)

OCILayerSelector specifies which layer should be extracted from an OCI Artifact

@@ -3184,11 +3184,11 @@ is persisted to storage as it is.

-

OCIRepositoryRef +

OCIRepositoryRef

(Appears on: -OCIRepositorySpec) +OCIRepositorySpec)

OCIRepositoryRef defines the image reference for the OCIRepository’s URL

@@ -3255,11 +3255,11 @@ string
-

OCIRepositorySpec +

OCIRepositorySpec

(Appears on: -OCIRepository) +OCIRepository)

OCIRepositorySpec defines the desired state of OCIRepository

@@ -3288,7 +3288,7 @@ on a remote container registry.

ref
- + OCIRepositoryRef @@ -3303,7 +3303,7 @@ defaults to the latest tag.

layerSelector
- + OCILayerSelector @@ -3347,7 +3347,7 @@ The secret must be of type kubernetes.io/dockerconfigjson.

verify
- + OCIRepositoryVerification @@ -3484,11 +3484,11 @@ bool
-

OCIRepositoryStatus +

OCIRepositoryStatus

(Appears on: -OCIRepository) +OCIRepository)

OCIRepositoryStatus defines the observed state of OCIRepository

@@ -3570,7 +3570,7 @@ the source artifact.

observedLayerSelector
- + OCILayerSelector @@ -3600,12 +3600,12 @@ github.com/fluxcd/pkg/apis/meta.ReconcileRequestStatus
-

OCIRepositoryVerification +

OCIRepositoryVerification

(Appears on: -HelmChartSpec, -OCIRepositorySpec) +HelmChartSpec, +OCIRepositorySpec)

OCIRepositoryVerification verifies the authenticity of an OCI Artifact

@@ -3648,7 +3648,7 @@ trusted public keys.

matchOIDCIdentity
- + []OIDCIdentityMatch @@ -3665,11 +3665,11 @@ specified matchers match against the identity.

-

OIDCIdentityMatch +

OIDCIdentityMatch

(Appears on: -OCIRepositoryVerification) +OCIRepositoryVerification)

OIDCIdentityMatch specifies options for verifying the certificate identity, i.e. the issuer and the subject of the certificate.

@@ -3713,11 +3713,11 @@ be a valid Go regular expression.

-

Source +

Source

Source interface must be supported by all API types. Source is the interface that provides generic access to the Artifact and -interval. It must be supported by all kinds of the source.toolkit.fluxcd.io +interval. It must be supported by all kinds of the source.werf.io API group.

This page was automatically generated with gen-crd-api-reference-docs

diff --git a/docs/api/v1beta2/source.md b/docs/api/v1beta2/source.md index 8234f7014..c00b4f8f9 100644 --- a/docs/api/v1beta2/source.md +++ b/docs/api/v1beta2/source.md @@ -2,24 +2,24 @@

Packages:

-

source.toolkit.fluxcd.io/v1beta2

+

source.werf.io/v1beta2

Package v1beta2 contains API Schema definitions for the source v1beta2 API group

Resource Types: -

Bucket +

Bucket

Bucket is the Schema for the buckets API.

@@ -37,7 +37,7 @@ Resource Types: apiVersion
string -source.toolkit.fluxcd.io/v1beta2 +source.werf.io/v1beta2 @@ -67,7 +67,7 @@ Refer to the Kubernetes API documentation for the fields of the spec
- + BucketSpec @@ -116,7 +116,7 @@ string sts
- + BucketSTSSpec @@ -300,7 +300,7 @@ NOTE: Not implemented, provisional as of + BucketStatus @@ -312,7 +312,7 @@ BucketStatus
-

GitRepository +

GitRepository

GitRepository is the Schema for the gitrepositories API.

@@ -330,7 +330,7 @@ BucketStatus apiVersion
string -source.toolkit.fluxcd.io/v1beta2 +source.werf.io/v1beta2 @@ -360,7 +360,7 @@ Refer to the Kubernetes API documentation for the fields of the spec
- + GitRepositorySpec @@ -430,7 +430,7 @@ Kubernetes meta/v1.Duration ref
- + GitRepositoryRef @@ -445,7 +445,7 @@ changes, defaults to the ‘master’ branch.

verify
- + GitRepositoryVerification @@ -515,7 +515,7 @@ the GitRepository as cloned from the URL, using their default settings.

include
- + []GitRepositoryInclude @@ -548,7 +548,7 @@ NOTE: Not implemented, provisional as of + GitRepositoryStatus @@ -560,7 +560,7 @@ GitRepositoryStatus
-

HelmChart +

HelmChart

HelmChart is the Schema for the helmcharts API.

@@ -578,7 +578,7 @@ GitRepositoryStatus apiVersion
string -source.toolkit.fluxcd.io/v1beta2 +source.werf.io/v1beta2 @@ -608,7 +608,7 @@ Refer to the Kubernetes API documentation for the fields of the spec
- + HelmChartSpec @@ -646,7 +646,7 @@ GitRepository and Bucket sources. Defaults to latest when omitted.

sourceRef
- + LocalHelmChartSourceReference @@ -783,7 +783,7 @@ Chart dependencies, which are not bundled in the umbrella chart artifact, are no status
- + HelmChartStatus @@ -795,7 +795,7 @@ HelmChartStatus
-

HelmRepository +

HelmRepository

HelmRepository is the Schema for the helmrepositories API.

@@ -813,7 +813,7 @@ HelmChartStatus apiVersion
string -source.toolkit.fluxcd.io/v1beta2 +source.werf.io/v1beta2 @@ -843,7 +843,7 @@ Refer to the Kubernetes API documentation for the fields of the spec
- + HelmRepositorySpec @@ -1036,7 +1036,7 @@ When not specified, defaults to ‘generic’.

status
- + HelmRepositoryStatus @@ -1048,7 +1048,7 @@ HelmRepositoryStatus
-

OCIRepository +

OCIRepository

OCIRepository is the Schema for the ocirepositories API

@@ -1066,7 +1066,7 @@ HelmRepositoryStatus apiVersion
string -source.toolkit.fluxcd.io/v1beta2 +source.werf.io/v1beta2 @@ -1096,7 +1096,7 @@ Refer to the Kubernetes API documentation for the fields of the spec
- + OCIRepositorySpec @@ -1121,7 +1121,7 @@ on a remote container registry.

ref
- + OCIRepositoryRef @@ -1136,7 +1136,7 @@ defaults to the latest tag.

layerSelector
- + OCILayerSelector @@ -1322,7 +1322,7 @@ bool status
- + OCIRepositoryStatus @@ -1334,7 +1334,7 @@ OCIRepositoryStatus
-

Artifact +

Artifact

Artifact represents the output of a Source reconciliation.

Deprecated: use Artifact from api/v1 instead. This type will be removed in @@ -1455,11 +1455,11 @@ map[string]string -

BucketSTSSpec +

BucketSTSSpec

(Appears on: -BucketSpec) +BucketSpec)

BucketSTSSpec specifies the required configuration to use a Security Token Service for fetching temporary credentials to authenticate in a Bucket @@ -1543,11 +1543,11 @@ be of type Opaque or kubernetes.io/tls.

-

BucketSpec +

BucketSpec

(Appears on: -Bucket) +Bucket)

BucketSpec specifies the required configuration to produce an Artifact for an object storage bucket.

@@ -1601,7 +1601,7 @@ string sts
- + BucketSTSSpec @@ -1782,11 +1782,11 @@ NOTE: Not implemented, provisional as of BucketStatus +

BucketStatus

(Appears on: -Bucket) +Bucket)

BucketStatus records the observed state of a Bucket.

@@ -1885,12 +1885,12 @@ github.com/fluxcd/pkg/apis/meta.ReconcileRequestStatus
-

GitRepositoryInclude +

GitRepositoryInclude

(Appears on: -GitRepositorySpec, -GitRepositoryStatus) +GitRepositorySpec, +GitRepositoryStatus)

GitRepositoryInclude specifies a local reference to a GitRepository which Artifact (sub-)contents must be included, and where they should be placed.

@@ -1948,11 +1948,11 @@ the GitRepositoryRef.

-

GitRepositoryRef +

GitRepositoryRef

(Appears on: -GitRepositorySpec) +GitRepositorySpec)

GitRepositoryRef specifies the Git reference to resolve and checkout.

@@ -2033,11 +2033,11 @@ the commit is expected to exist.

-

GitRepositorySpec +

GitRepositorySpec

(Appears on: -GitRepository) +GitRepository)

GitRepositorySpec specifies the required configuration to produce an Artifact for a Git repository.

@@ -2112,7 +2112,7 @@ Kubernetes meta/v1.Duration ref
- + GitRepositoryRef @@ -2127,7 +2127,7 @@ changes, defaults to the ‘master’ branch.

verify
- + GitRepositoryVerification @@ -2197,7 +2197,7 @@ the GitRepository as cloned from the URL, using their default settings.

include
- + []GitRepositoryInclude @@ -2227,11 +2227,11 @@ NOTE: Not implemented, provisional as of GitRepositoryStatus +

GitRepositoryStatus

(Appears on: -GitRepository) +GitRepository)

GitRepositoryStatus records the observed state of a Git repository.

@@ -2366,7 +2366,7 @@ configuration used to produce the current Artifact.

observedInclude
- + []GitRepositoryInclude @@ -2396,11 +2396,11 @@ github.com/fluxcd/pkg/apis/meta.ReconcileRequestStatus
-

GitRepositoryVerification +

GitRepositoryVerification

(Appears on: -GitRepositorySpec) +GitRepositorySpec)

GitRepositoryVerification specifies the Git commit signature verification strategy.

@@ -2443,11 +2443,11 @@ authors.

-

HelmChartSpec +

HelmChartSpec

(Appears on: -HelmChart) +HelmChart)

HelmChartSpec specifies the desired state of a Helm chart.

@@ -2489,7 +2489,7 @@ GitRepository and Bucket sources. Defaults to latest when omitted.

sourceRef
- + LocalHelmChartSourceReference @@ -2623,11 +2623,11 @@ Chart dependencies, which are not bundled in the umbrella chart artifact, are no
-

HelmChartStatus +

HelmChartStatus

(Appears on: -HelmChart) +HelmChart)

HelmChartStatus records the observed state of the HelmChart.

@@ -2754,11 +2754,11 @@ github.com/fluxcd/pkg/apis/meta.ReconcileRequestStatus
-

HelmRepositorySpec +

HelmRepositorySpec

(Appears on: -HelmRepository) +HelmRepository)

HelmRepositorySpec specifies the required configuration to produce an Artifact for a Helm repository index YAML.

@@ -2953,11 +2953,11 @@ When not specified, defaults to ‘generic’.

-

HelmRepositoryStatus +

HelmRepositoryStatus

(Appears on: -HelmRepository) +HelmRepository)

HelmRepositoryStatus records the observed state of the HelmRepository.

@@ -3044,11 +3044,11 @@ github.com/fluxcd/pkg/apis/meta.ReconcileRequestStatus
-

LocalHelmChartSourceReference +

LocalHelmChartSourceReference

(Appears on: -HelmChartSpec) +HelmChartSpec)

LocalHelmChartSourceReference contains enough information to let you locate the typed referenced object at namespace level.

@@ -3101,12 +3101,12 @@ string -

OCILayerSelector +

OCILayerSelector

(Appears on: -OCIRepositorySpec, -OCIRepositoryStatus) +OCIRepositorySpec, +OCIRepositoryStatus)

OCILayerSelector specifies which layer should be extracted from an OCI Artifact

@@ -3152,11 +3152,11 @@ is persisted to storage as it is.

-

OCIRepositoryRef +

OCIRepositoryRef

(Appears on: -OCIRepositorySpec) +OCIRepositorySpec)

OCIRepositoryRef defines the image reference for the OCIRepository’s URL

@@ -3223,11 +3223,11 @@ string
-

OCIRepositorySpec +

OCIRepositorySpec

(Appears on: -OCIRepository) +OCIRepository)

OCIRepositorySpec defines the desired state of OCIRepository

@@ -3256,7 +3256,7 @@ on a remote container registry.

ref
- + OCIRepositoryRef @@ -3271,7 +3271,7 @@ defaults to the latest tag.

layerSelector
- + OCILayerSelector @@ -3454,11 +3454,11 @@ bool
-

OCIRepositoryStatus +

OCIRepositoryStatus

(Appears on: -OCIRepository) +OCIRepository)

OCIRepositoryStatus defines the observed state of OCIRepository

@@ -3561,7 +3561,7 @@ the source artifact.

observedLayerSelector
- + OCILayerSelector @@ -3591,11 +3591,11 @@ github.com/fluxcd/pkg/apis/meta.ReconcileRequestStatus
-

Source +

Source

Source interface must be supported by all API types. Source is the interface that provides generic access to the Artifact and -interval. It must be supported by all kinds of the source.toolkit.fluxcd.io +interval. It must be supported by all kinds of the source.werf.io API group.

Deprecated: use the Source interface from api/v1 instead. This type will be removed in a future release.

diff --git a/docs/spec/v1/README.md b/docs/spec/v1/README.md index f08ea805f..6d07fdb56 100644 --- a/docs/spec/v1/README.md +++ b/docs/spec/v1/README.md @@ -1,4 +1,4 @@ -# source.toolkit.fluxcd.io/v1 +# source.werf.io/v1 This is the v1 API specification for defining the desired state sources of Kubernetes clusters. diff --git a/docs/spec/v1/buckets.md b/docs/spec/v1/buckets.md index 077ac952b..6380653d5 100644 --- a/docs/spec/v1/buckets.md +++ b/docs/spec/v1/buckets.md @@ -14,7 +14,7 @@ compatible API (e.g. [Minio](https://min.io)): ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: minio-bucket @@ -158,7 +158,7 @@ The Provider allows for specifying a region the bucket is in using the ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: generic-insecure @@ -208,7 +208,7 @@ the source-controller service account that grants access to the bucket. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: aws @@ -250,7 +250,7 @@ Replace `` with the specified `.spec.bucketName`. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: aws @@ -279,7 +279,7 @@ data: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: aws-controller-level-workload-identity @@ -301,7 +301,7 @@ be enabled. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: aws-object-level-workload-identity @@ -363,7 +363,7 @@ the base URL can be configured using `.data.authorityHost`. If not supplied, ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: azure-public @@ -380,7 +380,7 @@ spec: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: azure-service-principal-secret @@ -409,7 +409,7 @@ data: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: azure-service-principal-cert @@ -441,7 +441,7 @@ data: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: azure-managed-identity @@ -468,7 +468,7 @@ data: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: azure-shared-key @@ -559,7 +559,7 @@ Deployment and ServiceAccount, then you don't need to reference a Secret. For mo please see [documentation](https://azure.github.io/azure-workload-identity/docs/quick-start.html). ```yaml -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: azure-bucket @@ -579,7 +579,7 @@ be enabled. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: azure-object-level-workload-identity @@ -606,7 +606,7 @@ metadata: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: azure-sas-token @@ -660,7 +660,7 @@ For detailed setup instructions, see: https://fluxcd.io/flux/integrations/gcp/#f ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: gcp-controller-level-workload-identity @@ -682,7 +682,7 @@ be enabled. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: gcp-object-level-workload-identity @@ -709,7 +709,7 @@ metadata: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: gcp-secret @@ -814,7 +814,7 @@ Example for the `ldap` provider: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: example @@ -904,7 +904,7 @@ Example usage: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: example @@ -1062,7 +1062,7 @@ file exclusions. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: @@ -1119,7 +1119,7 @@ In your YAML declaration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: @@ -1150,7 +1150,7 @@ In your YAML declaration, comment out (or remove) the field: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: @@ -1255,7 +1255,7 @@ The Artifact file is a gzip compressed TAR archive ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: Bucket metadata: name: diff --git a/docs/spec/v1/externalartifacts.md b/docs/spec/v1/externalartifacts.md index 1eccbe0e0..0b7b40dc8 100644 --- a/docs/spec/v1/externalartifacts.md +++ b/docs/spec/v1/externalartifacts.md @@ -14,7 +14,7 @@ The following is an example of a ExternalArtifact produced by a 3rd party source controller: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: ExternalArtifact metadata: name: my-artifact diff --git a/docs/spec/v1/gitrepositories.md b/docs/spec/v1/gitrepositories.md index d39ee73d3..3384f196d 100644 --- a/docs/spec/v1/gitrepositories.md +++ b/docs/spec/v1/gitrepositories.md @@ -13,7 +13,7 @@ resolved reference. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: podinfo @@ -451,7 +451,7 @@ To Git checkout a specified branch, use `.spec.ref.branch`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: @@ -468,7 +468,7 @@ To Git checkout a specified tag, use `.spec.ref.tag`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: @@ -487,7 +487,7 @@ use `.spec.ref.semver`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: @@ -508,7 +508,7 @@ use `.spec.ref.name`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: @@ -536,7 +536,7 @@ To Git checkout a specified commit, use `.spec.ref.commit`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: @@ -551,7 +551,7 @@ commit must exist: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: @@ -582,7 +582,7 @@ signatures. The field offers two subfields: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: podinfo @@ -652,7 +652,7 @@ checkout when cloning the repository. If specified, only the specified directory contents will be present in the artifact produced for this repository. ```yaml -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: podinfo @@ -751,7 +751,7 @@ multiple benefits over regular submodules: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: include-example @@ -796,7 +796,7 @@ exclusions. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: @@ -853,7 +853,7 @@ In your YAML declaration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: @@ -884,7 +884,7 @@ In your YAML declaration, comment out (or remove) the field: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: @@ -989,7 +989,7 @@ can be retrieved in-cluster from the `.status.artifact.url` HTTP address. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: GitRepository metadata: name: diff --git a/docs/spec/v1/helmcharts.md b/docs/spec/v1/helmcharts.md index eae4d5b9c..33309df1a 100644 --- a/docs/spec/v1/helmcharts.md +++ b/docs/spec/v1/helmcharts.md @@ -13,7 +13,7 @@ configuration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: podinfo @@ -278,7 +278,7 @@ The `cosign` provider can be used to verify the signature of an OCI artifact usi ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: podinfo @@ -340,7 +340,7 @@ Example of verifying HelmCharts signed by the [Cosign GitHub Action](https://github.com/sigstore/cosign-installer) with GitHub OIDC Token: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: podinfo @@ -361,7 +361,7 @@ spec: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: podinfo @@ -384,7 +384,7 @@ trust policy and CA certificate. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: podinfo @@ -464,7 +464,7 @@ In your YAML declaration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: @@ -489,7 +489,7 @@ In your YAML declaration, comment out (or remove) the field: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: @@ -637,7 +637,7 @@ and can be retrieved in-cluster from the `.status.artifact.url` HTTP address. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: @@ -659,7 +659,7 @@ with the `HelmChart` object generation. For example, if the chart version is ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: @@ -684,7 +684,7 @@ the `status.artifact.revision` value will be `6.0.3+4e5cbb7b97d0`. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmChart metadata: name: diff --git a/docs/spec/v1/helmrepositories.md b/docs/spec/v1/helmrepositories.md index 97fdff2ec..ac270244e 100644 --- a/docs/spec/v1/helmrepositories.md +++ b/docs/spec/v1/helmrepositories.md @@ -19,7 +19,7 @@ repository](https://github.com/stefanprodan/podinfo)): ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: podinfo @@ -98,7 +98,7 @@ The following is an example of an OCI HelmRepository. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: podinfo @@ -379,7 +379,7 @@ For example: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: example @@ -404,7 +404,7 @@ OCI Helm repository example: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: podinfo @@ -470,7 +470,7 @@ Example usage: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: example @@ -567,7 +567,7 @@ In your YAML declaration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: @@ -598,7 +598,7 @@ In your YAML declaration, comment out (or remove) the field: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: @@ -711,7 +711,7 @@ The Artifact file is an exact copy of the Helm repository index YAML ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: HelmRepository metadata: name: diff --git a/docs/spec/v1/ocirepositories.md b/docs/spec/v1/ocirepositories.md index d2bfa399e..12e2b86dc 100644 --- a/docs/spec/v1/ocirepositories.md +++ b/docs/spec/v1/ocirepositories.md @@ -13,7 +13,7 @@ resolved digest. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: podinfo @@ -315,7 +315,7 @@ Example usage: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: example @@ -426,7 +426,7 @@ To pull a specific tag, use `.spec.ref.tag`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: @@ -443,7 +443,7 @@ use `.spec.ref.semver`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: @@ -467,7 +467,7 @@ is set. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: podinfo @@ -492,7 +492,7 @@ To pull a specific digest, use `.spec.ref.digest`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: @@ -513,7 +513,7 @@ To extract a layer matching a specific ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: @@ -565,7 +565,7 @@ or via the [Cosign Keyless](https://github.com/sigstore/cosign/blob/main/KEYLESS ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: @@ -627,7 +627,7 @@ Example of verifying artifacts signed by the [Cosign GitHub Action](https://github.com/sigstore/cosign-installer) with GitHub OIDC Token: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: podinfo @@ -654,7 +654,7 @@ trust policy and CA certificate. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: @@ -715,7 +715,7 @@ the [`.spec.ignore` field](#ignore). ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: @@ -782,7 +782,7 @@ In your YAML declaration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: @@ -813,7 +813,7 @@ In your YAML declaration, comment out (or remove) the field: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: @@ -928,7 +928,7 @@ can be retrieved in-cluster from the `.status.artifact.url` HTTP address. #### Artifact example ```yaml -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.werf.io/v1 kind: OCIRepository metadata: name: diff --git a/docs/spec/v1alpha1/README.md b/docs/spec/v1alpha1/README.md index bdb5b519c..ac3b3554d 100644 --- a/docs/spec/v1alpha1/README.md +++ b/docs/spec/v1alpha1/README.md @@ -1,4 +1,4 @@ -# source.toolkit.fluxcd.io/v1alpha1 +# source.werf.io/v1alpha1 This is the v1alpha1 API specification for defining the desired state sources of Kubernetes clusters. diff --git a/docs/spec/v1alpha1/buckets.md b/docs/spec/v1alpha1/buckets.md index bb2c07a96..2054810c4 100644 --- a/docs/spec/v1alpha1/buckets.md +++ b/docs/spec/v1alpha1/buckets.md @@ -117,7 +117,7 @@ entries may overrule default exclusions. Another option is to use the `spec.ignore` field, for example: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: Bucket metadata: name: podinfo @@ -142,7 +142,7 @@ Authentication credentials can be provided with a Kubernetes secret that contain `accesskey` and `secretkey` fields: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: Bucket metadata: name: podinfo diff --git a/docs/spec/v1alpha1/gitrepositories.md b/docs/spec/v1alpha1/gitrepositories.md index fc1a2c293..757475b6b 100644 --- a/docs/spec/v1alpha1/gitrepositories.md +++ b/docs/spec/v1alpha1/gitrepositories.md @@ -140,7 +140,7 @@ entries may overrule default exclusions. Another option is to use the `spec.ignore` field, for example: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: GitRepository metadata: name: podinfo @@ -166,7 +166,7 @@ When specified, `spec.ignore` overrides the default exclusion list. Pull the master branch of a public repository every minute: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: GitRepository metadata: name: podinfo @@ -178,7 +178,7 @@ spec: Pull a specific branch: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: GitRepository metadata: name: podinfo @@ -192,7 +192,7 @@ spec: Checkout a specific commit from a branch: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: GitRepository metadata: name: podinfo @@ -207,7 +207,7 @@ spec: Pull a specific tag: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: GitRepository metadata: name: podinfo @@ -221,7 +221,7 @@ spec: Pull tag based on a [semver range](https://github.com/blang/semver#ranges): ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: GitRepository metadata: name: podinfo @@ -237,7 +237,7 @@ spec: HTTPS authentication requires a Kubernetes secret with `username` and `password` fields: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: GitRepository metadata: name: podinfo @@ -264,7 +264,7 @@ data: SSH authentication requires a Kubernetes secret with `identity` and `known_hosts` fields: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: GitRepository metadata: name: podinfo @@ -305,7 +305,7 @@ kubectl create secret generic ssh-credentials \ Verify the OpenPGP signature for the commit that master branch HEAD points to: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: GitRepository metadata: name: podinfo diff --git a/docs/spec/v1alpha1/helmcharts.md b/docs/spec/v1alpha1/helmcharts.md index abdec1ba6..b0e907ca7 100644 --- a/docs/spec/v1alpha1/helmcharts.md +++ b/docs/spec/v1alpha1/helmcharts.md @@ -102,7 +102,7 @@ const ( Pull a specific chart version every five minutes: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: HelmChart metadata: name: redis @@ -118,7 +118,7 @@ spec: Pull the latest chart version that matches the semver range every ten minutes: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: HelmChart metadata: name: redis @@ -135,7 +135,7 @@ Check a Git repository every ten minutes for a new `version` in the `Chart.yaml`, and package a new chart if the revision differs: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: HelmChart metadata: name: podinfo @@ -151,7 +151,7 @@ Check a S3 compatible bucket every ten minutes for a new `version` in the `Chart.yaml`, and package a new chart if the revision differs: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: HelmChart metadata: name: podinfo diff --git a/docs/spec/v1alpha1/helmrepositories.md b/docs/spec/v1alpha1/helmrepositories.md index e2d1bfc2f..a6dc2999b 100644 --- a/docs/spec/v1alpha1/helmrepositories.md +++ b/docs/spec/v1alpha1/helmrepositories.md @@ -71,7 +71,7 @@ const ( Pull the index of a public Helm repository every ten minutes: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: HelmRepository metadata: name: stable @@ -83,7 +83,7 @@ spec: Pull the index of a private Helm repository every minute: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1alpha1 +apiVersion: source.werf.io/v1alpha1 kind: HelmRepository metadata: name: private diff --git a/docs/spec/v1beta1/README.md b/docs/spec/v1beta1/README.md index 728f40623..f218a1cf9 100644 --- a/docs/spec/v1beta1/README.md +++ b/docs/spec/v1beta1/README.md @@ -1,4 +1,4 @@ -# source.toolkit.fluxcd.io/v1beta1 +# source.werf.io/v1beta1 This is the v1beta1 API specification for defining the desired state sources of Kubernetes clusters. diff --git a/docs/spec/v1beta1/buckets.md b/docs/spec/v1beta1/buckets.md index 70b77ec48..abcbaa0e3 100644 --- a/docs/spec/v1beta1/buckets.md +++ b/docs/spec/v1beta1/buckets.md @@ -132,7 +132,7 @@ entries may overrule default exclusions. Another option is to use the `spec.ignore` field, for example: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: Bucket metadata: name: podinfo @@ -158,7 +158,7 @@ Authentication credentials can be provided with a Kubernetes secret that contain `accesskey` and `secretkey` fields: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: Bucket metadata: name: podinfo @@ -193,7 +193,7 @@ When the provider is `aws` and the `secretRef` is not specified, the credentials are retrieve from the EC2 service: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: Bucket metadata: name: podinfo diff --git a/docs/spec/v1beta1/gitrepositories.md b/docs/spec/v1beta1/gitrepositories.md index 93f0f33ca..9e194a433 100644 --- a/docs/spec/v1beta1/gitrepositories.md +++ b/docs/spec/v1beta1/gitrepositories.md @@ -169,7 +169,7 @@ entries may overrule default exclusions. Another option is to use the `spec.ignore` field, for example: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -214,7 +214,7 @@ option to select the git library while accepting the drawbacks. Pull the master branch from a repository in Azure DevOps. ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -247,7 +247,7 @@ libgit2 v1.1.1 at the moment. Pull the master branch of a public repository every minute: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -260,7 +260,7 @@ spec: Pull a specific branch: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -275,7 +275,7 @@ spec: Checkout a specific commit from a branch: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -291,7 +291,7 @@ spec: Checkout a specific commit: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -306,7 +306,7 @@ spec: Pull a specific tag: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -321,7 +321,7 @@ spec: Pull tag based on a [semver range](https://github.com/Masterminds/semver#checking-version-constraints): ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -338,7 +338,7 @@ spec: HTTPS authentication requires a Kubernetes secret with `username` and `password` fields: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -365,7 +365,7 @@ data: Cloning over HTTPS from a Git repository with a self-signed certificate: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -396,7 +396,7 @@ can be omitted. SSH authentication requires a Kubernetes secret with `identity` and `known_hosts` fields: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -450,7 +450,7 @@ kubectl create secret generic ssh-credentials \ Verify the OpenPGP signature for the commit that master branch HEAD points to: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -493,7 +493,7 @@ With `spec.recurseSubmodules` you can configure the controller to clone a specific branch including its Git submodules: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: repo-with-submodules @@ -534,7 +534,7 @@ regular submodules: * Multiple `GitRepositories` could include the same repository, which decreases the amount of cloning done compared to using submodules. ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: app-repo @@ -547,7 +547,7 @@ spec: ref: branch: main --- -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: config-repo diff --git a/docs/spec/v1beta1/helmcharts.md b/docs/spec/v1beta1/helmcharts.md index 6c4461c2e..290437fd3 100644 --- a/docs/spec/v1beta1/helmcharts.md +++ b/docs/spec/v1beta1/helmcharts.md @@ -147,7 +147,7 @@ const ( Pull a specific chart version every five minutes: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: HelmChart metadata: name: redis @@ -165,7 +165,7 @@ Pull the latest chart version that matches the [semver range](https://github.com every ten minutes: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: HelmChart metadata: name: redis @@ -183,7 +183,7 @@ Check a Git repository every ten minutes for a new `version` in the `Chart.yaml`, and package a new chart if the revision differs: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: HelmChart metadata: name: podinfo @@ -200,7 +200,7 @@ Check a S3 compatible bucket every ten minutes for a new `version` in the `Chart.yaml`, and package a new chart if the revision differs: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: HelmChart metadata: name: podinfo @@ -217,7 +217,7 @@ Override default values with alternative values files relative to the path in the SourceRef: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: HelmChart metadata: name: redis @@ -235,7 +235,7 @@ spec: ``` ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: HelmChart metadata: name: podinfo @@ -254,7 +254,7 @@ spec: Reconcile with every change to the source revision: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: HelmChart metadata: name: podinfo diff --git a/docs/spec/v1beta1/helmrepositories.md b/docs/spec/v1beta1/helmrepositories.md index c194a72a0..42b4f9587 100644 --- a/docs/spec/v1beta1/helmrepositories.md +++ b/docs/spec/v1beta1/helmrepositories.md @@ -94,7 +94,7 @@ const ( Pull the index of a public Helm repository every ten minutes: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: HelmRepository metadata: name: stable @@ -107,7 +107,7 @@ spec: Pull the index of a private Helm repository every minute: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: HelmRepository metadata: name: private diff --git a/docs/spec/v1beta2/README.md b/docs/spec/v1beta2/README.md index 371015871..c3a132f36 100644 --- a/docs/spec/v1beta2/README.md +++ b/docs/spec/v1beta2/README.md @@ -1,4 +1,4 @@ -# source.toolkit.fluxcd.io/v1beta2 +# source.werf.io/v1beta2 This is the v1beta2 API specification for defining the desired state sources of Kubernetes clusters. diff --git a/docs/spec/v1beta2/buckets.md b/docs/spec/v1beta2/buckets.md index a78516f88..34d4b07f7 100644 --- a/docs/spec/v1beta2/buckets.md +++ b/docs/spec/v1beta2/buckets.md @@ -14,7 +14,7 @@ compatible API (e.g. [Minio](https://min.io)): ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: minio-bucket @@ -155,7 +155,7 @@ The Provider allows for specifying a region the bucket is in using the ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: generic-insecure @@ -203,7 +203,7 @@ the source-controller service account that grants access to the bucket. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: aws @@ -245,7 +245,7 @@ Replace `` with the specified `.spec.bucketName`. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: aws @@ -309,7 +309,7 @@ the base URL can be configured using `.data.authorityHost`. If not supplied, ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: azure-public @@ -326,7 +326,7 @@ spec: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: azure-service-principal-secret @@ -355,7 +355,7 @@ data: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: azure-service-principal-cert @@ -387,7 +387,7 @@ data: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: azure-managed-identity @@ -414,7 +414,7 @@ data: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: azure-shared-key @@ -505,7 +505,7 @@ Deployment and ServiceAccount, then you don't need to reference a Secret. For mo please see [documentation](https://azure.github.io/azure-workload-identity/docs/quick-start.html). ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: azure-bucket @@ -580,7 +580,7 @@ If you have set up aad-pod-identity correctly and labeled the source-controller Deployment, then you don't need to reference a Secret. ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: azure-bucket @@ -596,7 +596,7 @@ spec: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: azure-sas-token @@ -663,7 +663,7 @@ The Provider allows for specifying the ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: gcp-workload-identity @@ -681,7 +681,7 @@ spec: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: gcp-secret @@ -786,7 +786,7 @@ Example for the `ldap` provider: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: example @@ -876,7 +876,7 @@ Example usage: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: example @@ -1011,7 +1011,7 @@ file exclusions. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: @@ -1068,7 +1068,7 @@ In your YAML declaration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: @@ -1099,7 +1099,7 @@ In your YAML declaration, comment out (or remove) the field: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: @@ -1204,7 +1204,7 @@ The Artifact file is a gzip compressed TAR archive ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: Bucket metadata: name: diff --git a/docs/spec/v1beta2/gitrepositories.md b/docs/spec/v1beta2/gitrepositories.md index 03ffbeb82..7ec5e4ba5 100644 --- a/docs/spec/v1beta2/gitrepositories.md +++ b/docs/spec/v1beta2/gitrepositories.md @@ -13,7 +13,7 @@ resolved reference. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: podinfo @@ -247,7 +247,7 @@ To Git checkout a specified branch, use `.spec.ref.branch`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: @@ -264,7 +264,7 @@ To Git checkout a specified tag, use `.spec.ref.tag`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: @@ -283,7 +283,7 @@ use `.spec.ref.semver`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: @@ -304,7 +304,7 @@ use `.spec.ref.name`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: @@ -326,7 +326,7 @@ To Git checkout a specified commit, use `.spec.ref.commit`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: @@ -341,7 +341,7 @@ commit must exist: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: @@ -363,7 +363,7 @@ signatures. The field offers two subfields: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta1 +apiVersion: source.werf.io/v1beta1 kind: GitRepository metadata: name: podinfo @@ -489,7 +489,7 @@ multiple benefits over regular submodules: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: include-example @@ -534,7 +534,7 @@ exclusions. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: @@ -591,7 +591,7 @@ In your YAML declaration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: @@ -622,7 +622,7 @@ In your YAML declaration, comment out (or remove) the field: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: @@ -728,7 +728,7 @@ can be retrieved in-cluster from the `.status.artifact.url` HTTP address. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: GitRepository metadata: name: diff --git a/docs/spec/v1beta2/helmcharts.md b/docs/spec/v1beta2/helmcharts.md index 3932a9694..49777ae5d 100644 --- a/docs/spec/v1beta2/helmcharts.md +++ b/docs/spec/v1beta2/helmcharts.md @@ -13,7 +13,7 @@ configuration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmChart metadata: name: podinfo @@ -278,7 +278,7 @@ The `cosign` provider can be used to verify the signature of an OCI artifact usi ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmChart metadata: name: podinfo @@ -340,7 +340,7 @@ Example of verifying HelmCharts signed by the [Cosign GitHub Action](https://github.com/sigstore/cosign-installer) with GitHub OIDC Token: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmChart metadata: name: podinfo @@ -361,7 +361,7 @@ spec: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmRepository metadata: name: podinfo @@ -384,7 +384,7 @@ trust policy and CA certificate. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmChart metadata: name: podinfo @@ -464,7 +464,7 @@ In your YAML declaration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmChart metadata: name: @@ -489,7 +489,7 @@ In your YAML declaration, comment out (or remove) the field: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmChart metadata: name: @@ -637,7 +637,7 @@ and can be retrieved in-cluster from the `.status.artifact.url` HTTP address. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmChart metadata: name: @@ -659,7 +659,7 @@ with the `HelmChart` object generation. For example, if the chart version is ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmChart metadata: name: @@ -684,7 +684,7 @@ the `status.artifact.revision` value will be `6.0.3+4e5cbb7b97d0`. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmChart metadata: name: diff --git a/docs/spec/v1beta2/helmrepositories.md b/docs/spec/v1beta2/helmrepositories.md index 0fd33ed00..7bb91e8a4 100644 --- a/docs/spec/v1beta2/helmrepositories.md +++ b/docs/spec/v1beta2/helmrepositories.md @@ -19,7 +19,7 @@ repository](https://github.com/stefanprodan/podinfo)): ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmRepository metadata: name: podinfo @@ -98,7 +98,7 @@ The following is an example of an OCI HelmRepository. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmRepository metadata: name: podinfo @@ -412,7 +412,7 @@ For example: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmRepository metadata: name: example @@ -437,7 +437,7 @@ OCI Helm repository example: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmRepository metadata: name: podinfo @@ -503,7 +503,7 @@ Example usage: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmRepository metadata: name: example @@ -600,7 +600,7 @@ In your YAML declaration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmRepository metadata: name: @@ -631,7 +631,7 @@ In your YAML declaration, comment out (or remove) the field: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmRepository metadata: name: @@ -744,7 +744,7 @@ The Artifact file is an exact copy of the Helm repository index YAML ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: HelmRepository metadata: name: diff --git a/docs/spec/v1beta2/ocirepositories.md b/docs/spec/v1beta2/ocirepositories.md index eb5de4c5f..8b4ca24b1 100644 --- a/docs/spec/v1beta2/ocirepositories.md +++ b/docs/spec/v1beta2/ocirepositories.md @@ -13,7 +13,7 @@ resolved digest. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: podinfo @@ -302,7 +302,7 @@ Example usage: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: example @@ -417,7 +417,7 @@ To pull a specific tag, use `.spec.ref.tag`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: @@ -434,7 +434,7 @@ use `.spec.ref.semver`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: @@ -458,7 +458,7 @@ is set. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: podinfo @@ -483,7 +483,7 @@ To pull a specific digest, use `.spec.ref.digest`: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: @@ -504,7 +504,7 @@ To extract a layer matching a specific ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: @@ -556,7 +556,7 @@ or via the [Cosign Keyless](https://github.com/sigstore/cosign/blob/main/KEYLESS ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: @@ -618,7 +618,7 @@ Example of verifying artifacts signed by the [Cosign GitHub Action](https://github.com/sigstore/cosign-installer) with GitHub OIDC Token: ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: podinfo @@ -645,7 +645,7 @@ trust policy and CA certificate. ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: @@ -706,7 +706,7 @@ the [`.spec.ignore` field](#ignore). ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: @@ -773,7 +773,7 @@ In your YAML declaration: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: @@ -804,7 +804,7 @@ In your YAML declaration, comment out (or remove) the field: ```yaml --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: @@ -919,7 +919,7 @@ can be retrieved in-cluster from the `.status.artifact.url` HTTP address. #### Artifact example ```yaml -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.werf.io/v1beta2 kind: OCIRepository metadata: name: diff --git a/go.mod b/go.mod index 3affaa268..28db5d515 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ -module github.com/fluxcd/source-controller +module github.com/werf/nelm-source-controller go 1.25.0 -replace github.com/fluxcd/source-controller/api => ./api +replace github.com/werf/nelm-source-controller/api => ./api // Replace digest lib to master to gather access to BLAKE3. // xref: https://github.com/opencontainers/go-digest/pull/66 @@ -40,7 +40,6 @@ require ( github.com/fluxcd/pkg/tar v0.16.0 github.com/fluxcd/pkg/testserver v0.13.0 github.com/fluxcd/pkg/version v0.11.0 - github.com/fluxcd/source-controller/api v1.7.0 github.com/foxcpp/go-mockdns v1.1.0 github.com/go-git/go-billy/v5 v5.6.2 github.com/go-git/go-git/v5 v5.16.3 @@ -62,6 +61,7 @@ require ( github.com/sigstore/sigstore v1.9.5 github.com/sirupsen/logrus v1.9.3 github.com/spf13/pflag v1.0.10 + github.com/werf/nelm-source-controller/api v0.1.0 golang.org/x/crypto v0.44.0 golang.org/x/oauth2 v0.33.0 golang.org/x/sync v0.18.0 diff --git a/internal/bucket/azure/blob.go b/internal/bucket/azure/blob.go index 5bf814b7d..483cbc59d 100644 --- a/internal/bucket/azure/blob.go +++ b/internal/bucket/azure/blob.go @@ -41,7 +41,7 @@ import ( azureauth "github.com/fluxcd/pkg/auth/azure" "github.com/fluxcd/pkg/masktoken" - sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" ) var ( diff --git a/internal/bucket/azure/blob_integration_test.go b/internal/bucket/azure/blob_integration_test.go index 704b4c0c3..c3aee8349 100644 --- a/internal/bucket/azure/blob_integration_test.go +++ b/internal/bucket/azure/blob_integration_test.go @@ -44,7 +44,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" - sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" ) var ( diff --git a/internal/bucket/azure/blob_test.go b/internal/bucket/azure/blob_test.go index 83f17e900..5f994f969 100644 --- a/internal/bucket/azure/blob_test.go +++ b/internal/bucket/azure/blob_test.go @@ -37,9 +37,9 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - testlistener "github.com/fluxcd/source-controller/tests/listener" - testproxy "github.com/fluxcd/source-controller/tests/proxy" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + testlistener "github.com/werf/nelm-source-controller/tests/listener" + testproxy "github.com/werf/nelm-source-controller/tests/proxy" ) func TestNewClientAndBucketExistsWithProxy(t *testing.T) { diff --git a/internal/bucket/gcp/gcp.go b/internal/bucket/gcp/gcp.go index 70afe9fcd..80b788ffe 100644 --- a/internal/bucket/gcp/gcp.go +++ b/internal/bucket/gcp/gcp.go @@ -38,7 +38,7 @@ import ( "github.com/fluxcd/pkg/auth" gcpauth "github.com/fluxcd/pkg/auth/gcp" - sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" ) var ( diff --git a/internal/bucket/gcp/gcp_test.go b/internal/bucket/gcp/gcp_test.go index 0c12a72ea..b74146450 100644 --- a/internal/bucket/gcp/gcp_test.go +++ b/internal/bucket/gcp/gcp_test.go @@ -41,8 +41,8 @@ import ( corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - testproxy "github.com/fluxcd/source-controller/tests/proxy" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + testproxy "github.com/werf/nelm-source-controller/tests/proxy" ) const ( @@ -501,7 +501,7 @@ func getBucket() *raw.Bucket { func getObjectFile() string { return ` - apiVersion: source.toolkit.fluxcd.io/v1beta1 + apiVersion: source.werf.io/v1beta1 kind: Bucket metadata: name: podinfo diff --git a/internal/bucket/minio/minio.go b/internal/bucket/minio/minio.go index 026200a83..037e2b774 100644 --- a/internal/bucket/minio/minio.go +++ b/internal/bucket/minio/minio.go @@ -33,7 +33,7 @@ import ( "github.com/fluxcd/pkg/auth" awsauth "github.com/fluxcd/pkg/auth/aws" - sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" ) // MinioClient is a minimal Minio client for fetching files from S3 compatible diff --git a/internal/bucket/minio/minio_test.go b/internal/bucket/minio/minio_test.go index d6ba7baa4..badb8f8a4 100644 --- a/internal/bucket/minio/minio_test.go +++ b/internal/bucket/minio/minio_test.go @@ -44,9 +44,9 @@ import ( "github.com/fluxcd/pkg/apis/meta" "github.com/fluxcd/pkg/sourceignore" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - testlistener "github.com/fluxcd/source-controller/tests/listener" - testproxy "github.com/fluxcd/source-controller/tests/proxy" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + testlistener "github.com/werf/nelm-source-controller/tests/listener" + testproxy "github.com/werf/nelm-source-controller/tests/proxy" ) const ( @@ -775,7 +775,7 @@ func removeObjectFromBucket(ctx context.Context) { func getObjectFile() string { return ` - apiVersion: source.toolkit.fluxcd.io/v1 + apiVersion: source.werf.io/v1 kind: Bucket metadata: name: podinfo diff --git a/internal/controller/bucket_controller.go b/internal/controller/bucket_controller.go index 7fe881be6..f33f2ba41 100644 --- a/internal/controller/bucket_controller.go +++ b/internal/controller/bucket_controller.go @@ -57,14 +57,14 @@ import ( "github.com/fluxcd/pkg/runtime/secrets" "github.com/fluxcd/pkg/sourceignore" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/source-controller/internal/bucket/azure" - "github.com/fluxcd/source-controller/internal/bucket/gcp" - "github.com/fluxcd/source-controller/internal/bucket/minio" - serror "github.com/fluxcd/source-controller/internal/error" - "github.com/fluxcd/source-controller/internal/index" - sreconcile "github.com/fluxcd/source-controller/internal/reconcile" - "github.com/fluxcd/source-controller/internal/reconcile/summarize" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + "github.com/werf/nelm-source-controller/internal/bucket/azure" + "github.com/werf/nelm-source-controller/internal/bucket/gcp" + "github.com/werf/nelm-source-controller/internal/bucket/minio" + serror "github.com/werf/nelm-source-controller/internal/error" + "github.com/werf/nelm-source-controller/internal/index" + sreconcile "github.com/werf/nelm-source-controller/internal/reconcile" + "github.com/werf/nelm-source-controller/internal/reconcile/summarize" ) // maxConcurrentBucketFetches is the upper bound on the goroutines used to @@ -115,9 +115,9 @@ var bucketFailConditions = []string{ sourcev1.StorageOperationFailedCondition, } -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=buckets,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=buckets/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=buckets/finalizers,verbs=get;create;update;patch;delete +// +kubebuilder:rbac:groups=source.werf.io,resources=buckets,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=source.werf.io,resources=buckets/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=source.werf.io,resources=buckets/finalizers,verbs=get;create;update;patch;delete // +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch // +kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=get;list;watch // +kubebuilder:rbac:groups="",resources=serviceaccounts/token,verbs=create diff --git a/internal/controller/bucket_controller_fetch_test.go b/internal/controller/bucket_controller_fetch_test.go index 707d645f3..b3c2f7598 100644 --- a/internal/controller/bucket_controller_fetch_test.go +++ b/internal/controller/bucket_controller_fetch_test.go @@ -27,8 +27,8 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/source-controller/internal/index" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + "github.com/werf/nelm-source-controller/internal/index" ) type mockBucketObject struct { diff --git a/internal/controller/bucket_controller_test.go b/internal/controller/bucket_controller_test.go index 00ed46cb7..3b0cac474 100644 --- a/internal/controller/bucket_controller_test.go +++ b/internal/controller/bucket_controller_test.go @@ -46,12 +46,12 @@ import ( "github.com/fluxcd/pkg/runtime/jitter" "github.com/fluxcd/pkg/runtime/patch" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/source-controller/internal/index" - gcsmock "github.com/fluxcd/source-controller/internal/mock/gcs" - s3mock "github.com/fluxcd/source-controller/internal/mock/s3" - sreconcile "github.com/fluxcd/source-controller/internal/reconcile" - "github.com/fluxcd/source-controller/internal/reconcile/summarize" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + "github.com/werf/nelm-source-controller/internal/index" + gcsmock "github.com/werf/nelm-source-controller/internal/mock/gcs" + s3mock "github.com/werf/nelm-source-controller/internal/mock/s3" + sreconcile "github.com/werf/nelm-source-controller/internal/reconcile" + "github.com/werf/nelm-source-controller/internal/reconcile/summarize" ) // Environment variable to set the GCP Storage host for the GCP client. diff --git a/internal/controller/common_test.go b/internal/controller/common_test.go index d9dcf88c1..70889dc29 100644 --- a/internal/controller/common_test.go +++ b/internal/controller/common_test.go @@ -27,7 +27,7 @@ import ( "github.com/fluxcd/pkg/runtime/conditions" "github.com/fluxcd/pkg/runtime/patch" - "github.com/fluxcd/source-controller/internal/object" + "github.com/werf/nelm-source-controller/internal/object" ) // waitForSourceDeletion is a generic test helper to wait for object deletion of diff --git a/internal/controller/gitrepository_controller.go b/internal/controller/gitrepository_controller.go index 1208c8ae0..348bdca10 100644 --- a/internal/controller/gitrepository_controller.go +++ b/internal/controller/gitrepository_controller.go @@ -62,12 +62,12 @@ import ( rreconcile "github.com/fluxcd/pkg/runtime/reconcile" "github.com/fluxcd/pkg/sourceignore" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - serror "github.com/fluxcd/source-controller/internal/error" - "github.com/fluxcd/source-controller/internal/features" - sreconcile "github.com/fluxcd/source-controller/internal/reconcile" - "github.com/fluxcd/source-controller/internal/reconcile/summarize" - "github.com/fluxcd/source-controller/internal/util" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + serror "github.com/werf/nelm-source-controller/internal/error" + "github.com/werf/nelm-source-controller/internal/features" + sreconcile "github.com/werf/nelm-source-controller/internal/reconcile" + "github.com/werf/nelm-source-controller/internal/reconcile/summarize" + "github.com/werf/nelm-source-controller/internal/util" ) // gitRepositoryReadyCondition contains the information required to summarize a @@ -121,9 +121,9 @@ func getPatchOptions(ownedConditions []string, controllerName string) []patch.Op } } -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=gitrepositories,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=gitrepositories/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=gitrepositories/finalizers,verbs=get;create;update;patch;delete +// +kubebuilder:rbac:groups=source.werf.io,resources=gitrepositories,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=source.werf.io,resources=gitrepositories/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=source.werf.io,resources=gitrepositories/finalizers,verbs=get;create;update;patch;delete // +kubebuilder:rbac:groups="",resources=events,verbs=create;patch // GitRepositoryReconciler reconciles a v1.GitRepository object. diff --git a/internal/controller/gitrepository_controller_fuzz_test.go b/internal/controller/gitrepository_controller_fuzz_test.go index c9c136820..dbe4accb2 100644 --- a/internal/controller/gitrepository_controller_fuzz_test.go +++ b/internal/controller/gitrepository_controller_fuzz_test.go @@ -64,7 +64,7 @@ import ( "github.com/fluxcd/pkg/runtime/controller" "github.com/fluxcd/pkg/runtime/testenv" - sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" ) var ( diff --git a/internal/controller/gitrepository_controller_test.go b/internal/controller/gitrepository_controller_test.go index f9f7a591d..5b0b43969 100644 --- a/internal/controller/gitrepository_controller_test.go +++ b/internal/controller/gitrepository_controller_test.go @@ -60,11 +60,11 @@ import ( "github.com/fluxcd/pkg/ssh" "github.com/fluxcd/pkg/testserver" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - serror "github.com/fluxcd/source-controller/internal/error" - "github.com/fluxcd/source-controller/internal/features" - sreconcile "github.com/fluxcd/source-controller/internal/reconcile" - "github.com/fluxcd/source-controller/internal/reconcile/summarize" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + serror "github.com/werf/nelm-source-controller/internal/error" + "github.com/werf/nelm-source-controller/internal/features" + sreconcile "github.com/werf/nelm-source-controller/internal/reconcile" + "github.com/werf/nelm-source-controller/internal/reconcile/summarize" ) const ( @@ -2964,7 +2964,7 @@ func TestGitRepositoryReconciler_fetchIncludes(t *testing.T) { }, wantErr: true, assertConditions: []metav1.Condition{ - *conditions.TrueCondition(sourcev1.IncludeUnavailableCondition, "NotFound", "could not get resource for include 'a': gitrepositories.source.toolkit.fluxcd.io \"a\" not found"), + *conditions.TrueCondition(sourcev1.IncludeUnavailableCondition, "NotFound", "could not get resource for include 'a': gitrepositories.source.werf.io \"a\" not found"), }, }, { diff --git a/internal/controller/helmchart_controller.go b/internal/controller/helmchart_controller.go index e969bf67a..5d31003a8 100644 --- a/internal/controller/helmchart_controller.go +++ b/internal/controller/helmchart_controller.go @@ -65,18 +65,18 @@ import ( rreconcile "github.com/fluxcd/pkg/runtime/reconcile" "github.com/fluxcd/pkg/tar" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/source-controller/internal/cache" - serror "github.com/fluxcd/source-controller/internal/error" - "github.com/fluxcd/source-controller/internal/helm/chart" - "github.com/fluxcd/source-controller/internal/helm/getter" - "github.com/fluxcd/source-controller/internal/helm/repository" - soci "github.com/fluxcd/source-controller/internal/oci" - scosign "github.com/fluxcd/source-controller/internal/oci/cosign" - "github.com/fluxcd/source-controller/internal/oci/notation" - sreconcile "github.com/fluxcd/source-controller/internal/reconcile" - "github.com/fluxcd/source-controller/internal/reconcile/summarize" - "github.com/fluxcd/source-controller/internal/util" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + "github.com/werf/nelm-source-controller/internal/cache" + serror "github.com/werf/nelm-source-controller/internal/error" + "github.com/werf/nelm-source-controller/internal/helm/chart" + "github.com/werf/nelm-source-controller/internal/helm/getter" + "github.com/werf/nelm-source-controller/internal/helm/repository" + soci "github.com/werf/nelm-source-controller/internal/oci" + scosign "github.com/werf/nelm-source-controller/internal/oci/cosign" + "github.com/werf/nelm-source-controller/internal/oci/notation" + sreconcile "github.com/werf/nelm-source-controller/internal/reconcile" + "github.com/werf/nelm-source-controller/internal/reconcile/summarize" + "github.com/werf/nelm-source-controller/internal/util" ) // helmChartReadyCondition contains all the conditions information @@ -121,9 +121,9 @@ var helmChartFailConditions = []string{ sourcev1.StorageOperationFailedCondition, } -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmcharts,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmcharts/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmcharts/finalizers,verbs=get;create;update;patch;delete +// +kubebuilder:rbac:groups=source.werf.io,resources=helmcharts,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=source.werf.io,resources=helmcharts/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=source.werf.io,resources=helmcharts/finalizers,verbs=get;create;update;patch;delete // +kubebuilder:rbac:groups="",resources=events,verbs=create;patch // HelmChartReconciler reconciles a HelmChart object diff --git a/internal/controller/helmchart_controller_test.go b/internal/controller/helmchart_controller_test.go index 190a9f8b5..36422a010 100644 --- a/internal/controller/helmchart_controller_test.go +++ b/internal/controller/helmchart_controller_test.go @@ -71,15 +71,15 @@ import ( "github.com/fluxcd/pkg/runtime/patch" "github.com/fluxcd/pkg/testserver" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - serror "github.com/fluxcd/source-controller/internal/error" - "github.com/fluxcd/source-controller/internal/helm/chart" - "github.com/fluxcd/source-controller/internal/helm/chart/secureloader" - "github.com/fluxcd/source-controller/internal/helm/registry" - "github.com/fluxcd/source-controller/internal/oci" - snotation "github.com/fluxcd/source-controller/internal/oci/notation" - sreconcile "github.com/fluxcd/source-controller/internal/reconcile" - "github.com/fluxcd/source-controller/internal/reconcile/summarize" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + serror "github.com/werf/nelm-source-controller/internal/error" + "github.com/werf/nelm-source-controller/internal/helm/chart" + "github.com/werf/nelm-source-controller/internal/helm/chart/secureloader" + "github.com/werf/nelm-source-controller/internal/helm/registry" + "github.com/werf/nelm-source-controller/internal/oci" + snotation "github.com/werf/nelm-source-controller/internal/oci/notation" + sreconcile "github.com/werf/nelm-source-controller/internal/reconcile" + "github.com/werf/nelm-source-controller/internal/reconcile/summarize" ) func TestHelmChartReconciler_deleteBeforeFinalizer(t *testing.T) { @@ -682,12 +682,12 @@ func TestHelmChartReconciler_reconcileSource(t *testing.T) { conditions.MarkUnknown(obj, meta.ReadyCondition, "foo", "bar") }, want: sreconcile.ResultEmpty, - wantErr: &serror.Generic{Err: errors.New("gitrepositories.source.toolkit.fluxcd.io \"unavailable\" not found")}, + wantErr: &serror.Generic{Err: errors.New("gitrepositories.source.werf.io \"unavailable\" not found")}, assertFunc: func(g *WithT, build chart.Build, obj sourcev1.HelmChart) { g.Expect(build.Complete()).To(BeFalse()) g.Expect(obj.Status.Conditions).To(conditions.MatchConditions([]metav1.Condition{ - *conditions.TrueCondition(sourcev1.FetchFailedCondition, "SourceUnavailable", "failed to get source: gitrepositories.source.toolkit.fluxcd.io \"unavailable\" not found"), + *conditions.TrueCondition(sourcev1.FetchFailedCondition, "SourceUnavailable", "failed to get source: gitrepositories.source.werf.io \"unavailable\" not found"), *conditions.TrueCondition(meta.ReconcilingCondition, meta.ProgressingReason, "foo"), *conditions.UnknownCondition(meta.ReadyCondition, "foo", "bar"), })) diff --git a/internal/controller/helmrepository_controller.go b/internal/controller/helmrepository_controller.go index 06c4494cf..dac7f3b9b 100644 --- a/internal/controller/helmrepository_controller.go +++ b/internal/controller/helmrepository_controller.go @@ -51,14 +51,14 @@ import ( "github.com/fluxcd/pkg/runtime/predicates" rreconcile "github.com/fluxcd/pkg/runtime/reconcile" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/source-controller/internal/cache" - serror "github.com/fluxcd/source-controller/internal/error" - "github.com/fluxcd/source-controller/internal/helm/getter" - "github.com/fluxcd/source-controller/internal/helm/repository" - intpredicates "github.com/fluxcd/source-controller/internal/predicates" - sreconcile "github.com/fluxcd/source-controller/internal/reconcile" - "github.com/fluxcd/source-controller/internal/reconcile/summarize" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + "github.com/werf/nelm-source-controller/internal/cache" + serror "github.com/werf/nelm-source-controller/internal/error" + "github.com/werf/nelm-source-controller/internal/helm/getter" + "github.com/werf/nelm-source-controller/internal/helm/repository" + intpredicates "github.com/werf/nelm-source-controller/internal/predicates" + sreconcile "github.com/werf/nelm-source-controller/internal/reconcile" + "github.com/werf/nelm-source-controller/internal/reconcile/summarize" ) // helmRepositoryReadyCondition contains the information required to summarize a @@ -98,9 +98,9 @@ var helmRepositoryFailConditions = []string{ sourcev1.StorageOperationFailedCondition, } -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmrepositories,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmrepositories/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmrepositories/finalizers,verbs=get;create;update;patch;delete +// +kubebuilder:rbac:groups=source.werf.io,resources=helmrepositories,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=source.werf.io,resources=helmrepositories/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=source.werf.io,resources=helmrepositories/finalizers,verbs=get;create;update;patch;delete // +kubebuilder:rbac:groups="",resources=events,verbs=create;patch // HelmRepositoryReconciler reconciles a v1.HelmRepository object. diff --git a/internal/controller/helmrepository_controller_test.go b/internal/controller/helmrepository_controller_test.go index d76c58a42..696894f1e 100644 --- a/internal/controller/helmrepository_controller_test.go +++ b/internal/controller/helmrepository_controller_test.go @@ -51,12 +51,12 @@ import ( "github.com/fluxcd/pkg/runtime/patch" "github.com/fluxcd/pkg/runtime/secrets" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/source-controller/internal/cache" - "github.com/fluxcd/source-controller/internal/helm/repository" - intpredicates "github.com/fluxcd/source-controller/internal/predicates" - sreconcile "github.com/fluxcd/source-controller/internal/reconcile" - "github.com/fluxcd/source-controller/internal/reconcile/summarize" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + "github.com/werf/nelm-source-controller/internal/cache" + "github.com/werf/nelm-source-controller/internal/helm/repository" + intpredicates "github.com/werf/nelm-source-controller/internal/predicates" + sreconcile "github.com/werf/nelm-source-controller/internal/reconcile" + "github.com/werf/nelm-source-controller/internal/reconcile/summarize" ) func TestHelmRepositoryReconciler_deleteBeforeFinalizer(t *testing.T) { diff --git a/internal/controller/ocirepository_controller.go b/internal/controller/ocirepository_controller.go index a91c8a51b..0fc2f356f 100644 --- a/internal/controller/ocirepository_controller.go +++ b/internal/controller/ocirepository_controller.go @@ -71,14 +71,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/predicate" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - serror "github.com/fluxcd/source-controller/internal/error" - soci "github.com/fluxcd/source-controller/internal/oci" - scosign "github.com/fluxcd/source-controller/internal/oci/cosign" - "github.com/fluxcd/source-controller/internal/oci/notation" - sreconcile "github.com/fluxcd/source-controller/internal/reconcile" - "github.com/fluxcd/source-controller/internal/reconcile/summarize" - "github.com/fluxcd/source-controller/internal/util" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + serror "github.com/werf/nelm-source-controller/internal/error" + soci "github.com/werf/nelm-source-controller/internal/oci" + scosign "github.com/werf/nelm-source-controller/internal/oci/cosign" + "github.com/werf/nelm-source-controller/internal/oci/notation" + sreconcile "github.com/werf/nelm-source-controller/internal/reconcile" + "github.com/werf/nelm-source-controller/internal/reconcile/summarize" + "github.com/werf/nelm-source-controller/internal/util" ) // ociRepositoryReadyCondition contains the information required to summarize a @@ -173,9 +173,9 @@ func (r *OCIRepositoryReconciler) SetupWithManagerAndOptions(mgr ctrl.Manager, o Complete(r) } -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=ocirepositories,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=ocirepositories/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=ocirepositories/finalizers,verbs=get;create;update;patch;delete +// +kubebuilder:rbac:groups=source.werf.io,resources=ocirepositories,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=source.werf.io,resources=ocirepositories/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=source.werf.io,resources=ocirepositories/finalizers,verbs=get;create;update;patch;delete // +kubebuilder:rbac:groups="",resources=events,verbs=create;patch // +kubebuilder:rbac:groups="",resources=serviceaccounts/token,verbs=create diff --git a/internal/controller/ocirepository_controller_test.go b/internal/controller/ocirepository_controller_test.go index 6ea35e962..01f0609da 100644 --- a/internal/controller/ocirepository_controller_test.go +++ b/internal/controller/ocirepository_controller_test.go @@ -70,11 +70,11 @@ import ( "github.com/fluxcd/pkg/runtime/patch" "github.com/fluxcd/pkg/tar" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - serror "github.com/fluxcd/source-controller/internal/error" - snotation "github.com/fluxcd/source-controller/internal/oci/notation" - sreconcile "github.com/fluxcd/source-controller/internal/reconcile" - testproxy "github.com/fluxcd/source-controller/tests/proxy" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + serror "github.com/werf/nelm-source-controller/internal/error" + snotation "github.com/werf/nelm-source-controller/internal/oci/notation" + sreconcile "github.com/werf/nelm-source-controller/internal/reconcile" + testproxy "github.com/werf/nelm-source-controller/tests/proxy" ) func TestOCIRepositoryReconciler_deleteBeforeFinalizer(t *testing.T) { diff --git a/internal/controller/source_predicate.go b/internal/controller/source_predicate.go index 968f2def9..fb4cd653e 100644 --- a/internal/controller/source_predicate.go +++ b/internal/controller/source_predicate.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/predicate" - sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" ) type SourceRevisionChangePredicate struct { diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go index ad0365616..5c46b3398 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/suite_test.go @@ -57,8 +57,8 @@ import ( "github.com/fluxcd/pkg/runtime/testenv" "github.com/fluxcd/pkg/testserver" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/source-controller/internal/cache" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + "github.com/werf/nelm-source-controller/internal/cache" // +kubebuilder:scaffold:imports ) diff --git a/internal/helm/chart/builder.go b/internal/helm/chart/builder.go index 6ac896e78..8e426a01a 100644 --- a/internal/helm/chart/builder.go +++ b/internal/helm/chart/builder.go @@ -28,7 +28,7 @@ import ( helmchart "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chartutil" - "github.com/fluxcd/source-controller/internal/oci" + "github.com/werf/nelm-source-controller/internal/oci" ) // Reference holds information to locate a chart. diff --git a/internal/helm/chart/builder_local.go b/internal/helm/chart/builder_local.go index 44399a80a..d1741de28 100644 --- a/internal/helm/chart/builder_local.go +++ b/internal/helm/chart/builder_local.go @@ -28,7 +28,7 @@ import ( "github.com/fluxcd/pkg/runtime/transform" - "github.com/fluxcd/source-controller/internal/helm/chart/secureloader" + "github.com/werf/nelm-source-controller/internal/helm/chart/secureloader" ) type localChartBuilder struct { diff --git a/internal/helm/chart/builder_local_test.go b/internal/helm/chart/builder_local_test.go index 4b26e1419..83655e9db 100644 --- a/internal/helm/chart/builder_local_test.go +++ b/internal/helm/chart/builder_local_test.go @@ -29,8 +29,8 @@ import ( "helm.sh/helm/v3/pkg/chartutil" "helm.sh/helm/v3/pkg/repo" - "github.com/fluxcd/source-controller/internal/helm/chart/secureloader" - "github.com/fluxcd/source-controller/internal/helm/repository" + "github.com/werf/nelm-source-controller/internal/helm/chart/secureloader" + "github.com/werf/nelm-source-controller/internal/helm/repository" ) func TestLocalBuilder_Build(t *testing.T) { diff --git a/internal/helm/chart/builder_remote.go b/internal/helm/chart/builder_remote.go index 2cfdf81b4..86c2b1db8 100644 --- a/internal/helm/chart/builder_remote.go +++ b/internal/helm/chart/builder_remote.go @@ -33,9 +33,9 @@ import ( sourcefs "github.com/fluxcd/pkg/oci" "github.com/fluxcd/pkg/runtime/transform" - "github.com/fluxcd/source-controller/internal/helm/chart/secureloader" - "github.com/fluxcd/source-controller/internal/helm/repository" - "github.com/fluxcd/source-controller/internal/oci" + "github.com/werf/nelm-source-controller/internal/helm/chart/secureloader" + "github.com/werf/nelm-source-controller/internal/helm/repository" + "github.com/werf/nelm-source-controller/internal/oci" ) type remoteChartBuilder struct { diff --git a/internal/helm/chart/builder_remote_test.go b/internal/helm/chart/builder_remote_test.go index 7994fa5ee..5f95842ec 100644 --- a/internal/helm/chart/builder_remote_test.go +++ b/internal/helm/chart/builder_remote_test.go @@ -33,8 +33,8 @@ import ( helmgetter "helm.sh/helm/v3/pkg/getter" "helm.sh/helm/v3/pkg/registry" - "github.com/fluxcd/source-controller/internal/helm/chart/secureloader" - "github.com/fluxcd/source-controller/internal/helm/repository" + "github.com/werf/nelm-source-controller/internal/helm/chart/secureloader" + "github.com/werf/nelm-source-controller/internal/helm/repository" ) type mockRegistryClient struct { diff --git a/internal/helm/chart/builder_test.go b/internal/helm/chart/builder_test.go index d3fa55e38..56df8d34e 100644 --- a/internal/helm/chart/builder_test.go +++ b/internal/helm/chart/builder_test.go @@ -26,7 +26,7 @@ import ( . "github.com/onsi/gomega" "helm.sh/helm/v3/pkg/chartutil" - "github.com/fluxcd/source-controller/internal/helm/chart/secureloader" + "github.com/werf/nelm-source-controller/internal/helm/chart/secureloader" ) func TestLocalReference_Validate(t *testing.T) { diff --git a/internal/helm/chart/dependency_manager.go b/internal/helm/chart/dependency_manager.go index 8a3f0ccfb..8061d3d11 100644 --- a/internal/helm/chart/dependency_manager.go +++ b/internal/helm/chart/dependency_manager.go @@ -32,8 +32,8 @@ import ( helmchart "helm.sh/helm/v3/pkg/chart" "k8s.io/apimachinery/pkg/util/errors" - "github.com/fluxcd/source-controller/internal/helm/chart/secureloader" - "github.com/fluxcd/source-controller/internal/helm/repository" + "github.com/werf/nelm-source-controller/internal/helm/chart/secureloader" + "github.com/werf/nelm-source-controller/internal/helm/repository" ) // GetChartDownloaderCallback must return a Downloader for the diff --git a/internal/helm/chart/dependency_manager_test.go b/internal/helm/chart/dependency_manager_test.go index 241959fbe..1617afc2b 100644 --- a/internal/helm/chart/dependency_manager_test.go +++ b/internal/helm/chart/dependency_manager_test.go @@ -33,8 +33,8 @@ import ( "helm.sh/helm/v3/pkg/registry" "helm.sh/helm/v3/pkg/repo" - "github.com/fluxcd/source-controller/internal/helm/chart/secureloader" - "github.com/fluxcd/source-controller/internal/helm/repository" + "github.com/werf/nelm-source-controller/internal/helm/chart/secureloader" + "github.com/werf/nelm-source-controller/internal/helm/repository" ) type mockTagsGetter struct { diff --git a/internal/helm/chart/metadata.go b/internal/helm/chart/metadata.go index e3c91ac6b..ece5d91ad 100644 --- a/internal/helm/chart/metadata.go +++ b/internal/helm/chart/metadata.go @@ -35,7 +35,7 @@ import ( "helm.sh/helm/v3/pkg/chartutil" "sigs.k8s.io/yaml" - "github.com/fluxcd/source-controller/internal/helm" + "github.com/werf/nelm-source-controller/internal/helm" ) var drivePathPattern = regexp.MustCompile(`^[a-zA-Z]:/`) diff --git a/internal/helm/chart/metadata_test.go b/internal/helm/chart/metadata_test.go index 1c002a1df..e5d3af5ac 100644 --- a/internal/helm/chart/metadata_test.go +++ b/internal/helm/chart/metadata_test.go @@ -26,7 +26,7 @@ import ( helmchart "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chartutil" - "github.com/fluxcd/source-controller/internal/helm" + "github.com/werf/nelm-source-controller/internal/helm" ) var ( diff --git a/internal/helm/chart/secureloader/directory.go b/internal/helm/chart/secureloader/directory.go index 90285758b..ddb783818 100644 --- a/internal/helm/chart/secureloader/directory.go +++ b/internal/helm/chart/secureloader/directory.go @@ -37,9 +37,9 @@ import ( "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader" - "github.com/fluxcd/source-controller/internal/helm" - "github.com/fluxcd/source-controller/internal/helm/chart/secureloader/ignore" - "github.com/fluxcd/source-controller/internal/helm/chart/secureloader/sympath" + "github.com/werf/nelm-source-controller/internal/helm" + "github.com/werf/nelm-source-controller/internal/helm/chart/secureloader/ignore" + "github.com/werf/nelm-source-controller/internal/helm/chart/secureloader/sympath" ) var ( diff --git a/internal/helm/chart/secureloader/directory_test.go b/internal/helm/chart/secureloader/directory_test.go index 5dacfc7d8..db3d81e0b 100644 --- a/internal/helm/chart/secureloader/directory_test.go +++ b/internal/helm/chart/secureloader/directory_test.go @@ -30,8 +30,8 @@ import ( "helm.sh/helm/v3/pkg/chart" "sigs.k8s.io/yaml" - "github.com/fluxcd/source-controller/internal/helm" - "github.com/fluxcd/source-controller/internal/helm/chart/secureloader/ignore" + "github.com/werf/nelm-source-controller/internal/helm" + "github.com/werf/nelm-source-controller/internal/helm/chart/secureloader/ignore" ) func TestSecureDirLoader_Load(t *testing.T) { diff --git a/internal/helm/chart/secureloader/loader.go b/internal/helm/chart/secureloader/loader.go index e17adc314..1bcb0b0f3 100644 --- a/internal/helm/chart/secureloader/loader.go +++ b/internal/helm/chart/secureloader/loader.go @@ -28,7 +28,7 @@ import ( "helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart/loader" - "github.com/fluxcd/source-controller/internal/helm" + "github.com/werf/nelm-source-controller/internal/helm" ) // Loader returns a new loader.ChartLoader appropriate for the given chart diff --git a/internal/helm/chart/secureloader/loader_test.go b/internal/helm/chart/secureloader/loader_test.go index af7de550e..5152894a7 100644 --- a/internal/helm/chart/secureloader/loader_test.go +++ b/internal/helm/chart/secureloader/loader_test.go @@ -27,7 +27,7 @@ import ( "helm.sh/helm/v3/pkg/chart/loader" "sigs.k8s.io/yaml" - "github.com/fluxcd/source-controller/internal/helm" + "github.com/werf/nelm-source-controller/internal/helm" ) func TestLoader(t *testing.T) { diff --git a/internal/helm/getter/client_opts.go b/internal/helm/getter/client_opts.go index 2dba9a00a..7fb46825d 100644 --- a/internal/helm/getter/client_opts.go +++ b/internal/helm/getter/client_opts.go @@ -33,9 +33,9 @@ import ( "github.com/fluxcd/pkg/runtime/secrets" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/source-controller/internal/helm/registry" - soci "github.com/fluxcd/source-controller/internal/oci" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + "github.com/werf/nelm-source-controller/internal/helm/registry" + soci "github.com/werf/nelm-source-controller/internal/oci" ) const ( diff --git a/internal/helm/getter/client_opts_test.go b/internal/helm/getter/client_opts_test.go index bf40e7f86..acc24353f 100644 --- a/internal/helm/getter/client_opts_test.go +++ b/internal/helm/getter/client_opts_test.go @@ -30,7 +30,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" - helmv1 "github.com/fluxcd/source-controller/api/v1" + helmv1 "github.com/werf/nelm-source-controller/api/v1" ) func TestGetClientOpts(t *testing.T) { diff --git a/internal/helm/registry/auth.go b/internal/helm/registry/auth.go index c8b3ca6ae..a9bbbb87d 100644 --- a/internal/helm/registry/auth.go +++ b/internal/helm/registry/auth.go @@ -23,9 +23,9 @@ import ( "github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config/credentials" - "github.com/fluxcd/source-controller/internal/helm/common" - "github.com/fluxcd/source-controller/internal/oci" "github.com/google/go-containerregistry/pkg/authn" + "github.com/werf/nelm-source-controller/internal/helm/common" + "github.com/werf/nelm-source-controller/internal/oci" "helm.sh/helm/v3/pkg/registry" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/helm/repository/chart_repository.go b/internal/helm/repository/chart_repository.go index e8030ec7b..6542e16bd 100644 --- a/internal/helm/repository/chart_repository.go +++ b/internal/helm/repository/chart_repository.go @@ -41,8 +41,8 @@ import ( "github.com/fluxcd/pkg/version" "github.com/fluxcd/pkg/http/transport" - "github.com/fluxcd/source-controller/internal/helm" - "github.com/fluxcd/source-controller/internal/oci" + "github.com/werf/nelm-source-controller/internal/helm" + "github.com/werf/nelm-source-controller/internal/oci" ) var ( diff --git a/internal/helm/repository/chart_repository_test.go b/internal/helm/repository/chart_repository_test.go index 1b2f1c0fb..51ffe531d 100644 --- a/internal/helm/repository/chart_repository_test.go +++ b/internal/helm/repository/chart_repository_test.go @@ -33,7 +33,7 @@ import ( helmgetter "helm.sh/helm/v3/pkg/getter" "helm.sh/helm/v3/pkg/repo" - "github.com/fluxcd/source-controller/internal/helm" + "github.com/werf/nelm-source-controller/internal/helm" ) var now = time.Now() diff --git a/internal/helm/repository/oci_chart_repository.go b/internal/helm/repository/oci_chart_repository.go index 2bed964a2..c1d23c5da 100644 --- a/internal/helm/repository/oci_chart_repository.go +++ b/internal/helm/repository/oci_chart_repository.go @@ -38,7 +38,7 @@ import ( "github.com/fluxcd/pkg/http/transport" "github.com/fluxcd/pkg/version" - "github.com/fluxcd/source-controller/internal/oci" + "github.com/werf/nelm-source-controller/internal/oci" ) // RegistryClient is an interface for interacting with OCI registries diff --git a/internal/helm/repository/repository.go b/internal/helm/repository/repository.go index 6cee5f658..fe6472830 100644 --- a/internal/helm/repository/repository.go +++ b/internal/helm/repository/repository.go @@ -22,7 +22,7 @@ import ( "helm.sh/helm/v3/pkg/repo" - "github.com/fluxcd/source-controller/internal/oci" + "github.com/werf/nelm-source-controller/internal/oci" ) // Downloader is used to download a chart from a remote Helm repository or OCI Helm repository. diff --git a/internal/object/object_test.go b/internal/object/object_test.go index 35cab3303..824fed776 100644 --- a/internal/object/object_test.go +++ b/internal/object/object_test.go @@ -26,7 +26,7 @@ import ( "github.com/fluxcd/pkg/apis/meta" - sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" ) func TestGetStatusLastHandledReconcileAt(t *testing.T) { diff --git a/internal/oci/auth.go b/internal/oci/auth.go index 6bd35c59e..97e58c9a1 100644 --- a/internal/oci/auth.go +++ b/internal/oci/auth.go @@ -25,7 +25,7 @@ import ( "github.com/fluxcd/pkg/auth" authutils "github.com/fluxcd/pkg/auth/utils" - sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" ) // Anonymous is an authn.AuthConfig that always returns an anonymous diff --git a/internal/oci/cosign/cosign.go b/internal/oci/cosign/cosign.go index 75af33091..36335754c 100644 --- a/internal/oci/cosign/cosign.go +++ b/internal/oci/cosign/cosign.go @@ -31,7 +31,7 @@ import ( "github.com/sigstore/sigstore/pkg/cryptoutils" "github.com/sigstore/sigstore/pkg/signature" - soci "github.com/fluxcd/source-controller/internal/oci" + soci "github.com/werf/nelm-source-controller/internal/oci" ) // options is a struct that holds options for verifier. diff --git a/internal/oci/cosign/cosign_test.go b/internal/oci/cosign/cosign_test.go index f99e7d1f6..3f1cd478c 100644 --- a/internal/oci/cosign/cosign_test.go +++ b/internal/oci/cosign/cosign_test.go @@ -30,8 +30,8 @@ import ( . "github.com/onsi/gomega" "github.com/sigstore/cosign/v2/pkg/cosign" - testproxy "github.com/fluxcd/source-controller/tests/proxy" - testregistry "github.com/fluxcd/source-controller/tests/registry" + testproxy "github.com/werf/nelm-source-controller/tests/proxy" + testregistry "github.com/werf/nelm-source-controller/tests/registry" ) func TestOptions(t *testing.T) { diff --git a/internal/oci/notation/notation.go b/internal/oci/notation/notation.go index 0158ffd03..eb179b15e 100644 --- a/internal/oci/notation/notation.go +++ b/internal/oci/notation/notation.go @@ -39,8 +39,8 @@ import ( oauth "oras.land/oras-go/v2/registry/remote/auth" retryhttp "oras.land/oras-go/v2/registry/remote/retry" - "github.com/fluxcd/source-controller/internal/helm/common" - "github.com/fluxcd/source-controller/internal/oci" + "github.com/werf/nelm-source-controller/internal/helm/common" + "github.com/werf/nelm-source-controller/internal/oci" ) // name of the trustpolicy file defined in the Secret containing diff --git a/internal/oci/notation/notation_test.go b/internal/oci/notation/notation_test.go index cdd8a3872..37f49cd85 100644 --- a/internal/oci/notation/notation_test.go +++ b/internal/oci/notation/notation_test.go @@ -33,9 +33,9 @@ import ( "github.com/notaryproject/notation-go/verifier/trustpolicy" . "github.com/onsi/gomega" - "github.com/fluxcd/source-controller/internal/oci" - testproxy "github.com/fluxcd/source-controller/tests/proxy" - testregistry "github.com/fluxcd/source-controller/tests/registry" + "github.com/werf/nelm-source-controller/internal/oci" + testproxy "github.com/werf/nelm-source-controller/tests/proxy" + testregistry "github.com/werf/nelm-source-controller/tests/registry" ) func TestOptions(t *testing.T) { diff --git a/internal/predicates/helmrepository_type_predicate.go b/internal/predicates/helmrepository_type_predicate.go index 714d77942..3260b9ebd 100644 --- a/internal/predicates/helmrepository_type_predicate.go +++ b/internal/predicates/helmrepository_type_predicate.go @@ -22,7 +22,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/predicate" - sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" ) // HelmRepositoryOCIMigrationPredicate implements predicate functions to allow diff --git a/internal/predicates/helmrepository_type_predicate_test.go b/internal/predicates/helmrepository_type_predicate_test.go index e98728413..72ff5d2e5 100644 --- a/internal/predicates/helmrepository_type_predicate_test.go +++ b/internal/predicates/helmrepository_type_predicate_test.go @@ -25,7 +25,7 @@ import ( "github.com/fluxcd/pkg/apis/meta" "github.com/fluxcd/pkg/runtime/conditions" - sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" ) func TestHelmRepositoryOCIMigrationPredicate_Create(t *testing.T) { diff --git a/internal/reconcile/reconcile.go b/internal/reconcile/reconcile.go index 27c931168..34c83ab0d 100644 --- a/internal/reconcile/reconcile.go +++ b/internal/reconcile/reconcile.go @@ -25,7 +25,7 @@ import ( "github.com/fluxcd/pkg/runtime/conditions" "github.com/fluxcd/pkg/runtime/patch" - serror "github.com/fluxcd/source-controller/internal/error" + serror "github.com/werf/nelm-source-controller/internal/error" ) // Result is a type for creating an abstraction for the controller-runtime diff --git a/internal/reconcile/reconcile_test.go b/internal/reconcile/reconcile_test.go index e22f370b5..356846d6b 100644 --- a/internal/reconcile/reconcile_test.go +++ b/internal/reconcile/reconcile_test.go @@ -29,8 +29,8 @@ import ( "github.com/fluxcd/pkg/runtime/conditions" "github.com/fluxcd/pkg/runtime/patch" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - serror "github.com/fluxcd/source-controller/internal/error" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + serror "github.com/werf/nelm-source-controller/internal/error" ) func TestLowestRequeuingResult(t *testing.T) { diff --git a/internal/reconcile/summarize/matchers_test.go b/internal/reconcile/summarize/matchers_test.go index b71aa99c8..ee74a9429 100644 --- a/internal/reconcile/summarize/matchers_test.go +++ b/internal/reconcile/summarize/matchers_test.go @@ -23,7 +23,7 @@ import ( "github.com/onsi/gomega/types" "k8s.io/apimachinery/pkg/runtime" - "github.com/fluxcd/source-controller/internal/object" + "github.com/werf/nelm-source-controller/internal/object" ) // HaveStatusObservedGeneration returns a custom matcher to check if a diff --git a/internal/reconcile/summarize/processor.go b/internal/reconcile/summarize/processor.go index 746ca7c8e..550e66c77 100644 --- a/internal/reconcile/summarize/processor.go +++ b/internal/reconcile/summarize/processor.go @@ -26,9 +26,9 @@ import ( eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1" "github.com/fluxcd/pkg/apis/meta" - serror "github.com/fluxcd/source-controller/internal/error" - "github.com/fluxcd/source-controller/internal/object" - "github.com/fluxcd/source-controller/internal/reconcile" + serror "github.com/werf/nelm-source-controller/internal/error" + "github.com/werf/nelm-source-controller/internal/object" + "github.com/werf/nelm-source-controller/internal/reconcile" ) // ResultProcessor processes the results of reconciliation (the object, result diff --git a/internal/reconcile/summarize/processor_test.go b/internal/reconcile/summarize/processor_test.go index 44f68b5bf..618cc05b2 100644 --- a/internal/reconcile/summarize/processor_test.go +++ b/internal/reconcile/summarize/processor_test.go @@ -27,9 +27,9 @@ import ( "github.com/fluxcd/pkg/apis/meta" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/fluxcd/source-controller/internal/object" - "github.com/fluxcd/source-controller/internal/reconcile" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + "github.com/werf/nelm-source-controller/internal/object" + "github.com/werf/nelm-source-controller/internal/reconcile" ) func TestRecordReconcileReq(t *testing.T) { diff --git a/internal/reconcile/summarize/summary.go b/internal/reconcile/summarize/summary.go index 8650a0907..047307a64 100644 --- a/internal/reconcile/summarize/summary.go +++ b/internal/reconcile/summarize/summary.go @@ -29,7 +29,7 @@ import ( "github.com/fluxcd/pkg/runtime/conditions" "github.com/fluxcd/pkg/runtime/patch" - "github.com/fluxcd/source-controller/internal/reconcile" + "github.com/werf/nelm-source-controller/internal/reconcile" ) // Conditions contains all the conditions information needed to summarize the diff --git a/internal/reconcile/summarize/summary_test.go b/internal/reconcile/summarize/summary_test.go index c4c16e4eb..03f92be9b 100644 --- a/internal/reconcile/summarize/summary_test.go +++ b/internal/reconcile/summarize/summary_test.go @@ -36,9 +36,9 @@ import ( conditionscheck "github.com/fluxcd/pkg/runtime/conditions/check" "github.com/fluxcd/pkg/runtime/patch" - sourcev1 "github.com/fluxcd/source-controller/api/v1" - serror "github.com/fluxcd/source-controller/internal/error" - "github.com/fluxcd/source-controller/internal/reconcile" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" + serror "github.com/werf/nelm-source-controller/internal/error" + "github.com/werf/nelm-source-controller/internal/reconcile" ) // This tests the scenario where SummarizeAndPatch is used at the very end of a diff --git a/main.go b/main.go index cb019e6e4..535bb76ad 100644 --- a/main.go +++ b/main.go @@ -55,15 +55,15 @@ import ( "github.com/fluxcd/pkg/runtime/pprof" "github.com/fluxcd/pkg/runtime/probes" - sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1 "github.com/werf/nelm-source-controller/api/v1" // +kubebuilder:scaffold:imports - "github.com/fluxcd/source-controller/internal/cache" - "github.com/fluxcd/source-controller/internal/controller" - "github.com/fluxcd/source-controller/internal/features" - "github.com/fluxcd/source-controller/internal/helm" - "github.com/fluxcd/source-controller/internal/helm/registry" + "github.com/werf/nelm-source-controller/internal/cache" + "github.com/werf/nelm-source-controller/internal/controller" + "github.com/werf/nelm-source-controller/internal/features" + "github.com/werf/nelm-source-controller/internal/helm" + "github.com/werf/nelm-source-controller/internal/helm/registry" ) const controllerName = "source-controller" diff --git a/tests/proxy/proxy.go b/tests/proxy/proxy.go index 33fadece4..202071f1a 100644 --- a/tests/proxy/proxy.go +++ b/tests/proxy/proxy.go @@ -22,7 +22,7 @@ import ( "github.com/elazarl/goproxy" - testlistener "github.com/fluxcd/source-controller/tests/listener" + testlistener "github.com/werf/nelm-source-controller/tests/listener" ) // New creates a new goproxy server on a random port and returns diff --git a/tests/registry/registry.go b/tests/registry/registry.go index 28b36fd20..42bfcdbd5 100644 --- a/tests/registry/registry.go +++ b/tests/registry/registry.go @@ -36,7 +36,7 @@ import ( "github.com/fluxcd/pkg/oci" - testlistener "github.com/fluxcd/source-controller/tests/listener" + testlistener "github.com/werf/nelm-source-controller/tests/listener" ) func New(t *testing.T) string {