diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e51a792b8..030ad5887 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,9 +2,9 @@ name: Go on: push: - branches: [ master, rc ] + branches: [ master ] pull_request: - branches: [ master, rc ] + branches: [ master ] permissions: contents: read # to fetch code (actions/checkout) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 81f586fed..9feb4f8e7 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -2,10 +2,10 @@ name: "CodeQL analysis" on: push: - branches: [ master, rc ] + branches: [ master] pull_request: # The branches below must be a subset of the branches above - branches: [ master, rc ] + branches: [ master ] schedule: - cron: '35 13 * * 5' workflow_dispatch: diff --git a/.github/workflows/gh-workflow-approve.yaml b/.github/workflows/gh-workflow-approve.yaml index f9cfa02f8..c63152d1d 100644 --- a/.github/workflows/gh-workflow-approve.yaml +++ b/.github/workflows/gh-workflow-approve.yaml @@ -7,7 +7,6 @@ on: - synchronize branches: - master - - rc jobs: approve: diff --git a/.github/workflows/json-yaml-validate.yml b/.github/workflows/json-yaml-validate.yml index a3b013143..8aeb600c6 100644 --- a/.github/workflows/json-yaml-validate.yml +++ b/.github/workflows/json-yaml-validate.yml @@ -1,9 +1,9 @@ name: json-yaml-validate on: push: - branches: [ master, rc ] + branches: [ master ] pull_request: - branches: [ master, rc ] + branches: [ master ] workflow_dispatch: permissions: diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index caef29a68..a894704f2 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,10 +1,8 @@ name: Lint on: - push: - branches: [ master, rc ] pull_request: - branches: [ master, rc ] + branches: [ master ] jobs: lint: diff --git a/.github/workflows/release-chart.yaml b/.github/workflows/release-chart.yaml index 8ebc4e322..ac9190831 100644 --- a/.github/workflows/release-chart.yaml +++ b/.github/workflows/release-chart.yaml @@ -4,7 +4,6 @@ on: push: branches: - master - - rc paths: - "charts/external-dns/Chart.yaml" @@ -14,7 +13,7 @@ jobs: permissions: contents: write # to push chart release and create a release (helm/chart-releaser-action) - if: github.repository == 'conduitxyz/external-dns' + if: github.repository == 'kubernetes-sigs/external-dns' runs-on: ubuntu-latest defaults: run: diff --git a/.github/workflows/staging-image-tester.yaml b/.github/workflows/staging-image-tester.yaml index a01d9c07b..a6950195c 100644 --- a/.github/workflows/staging-image-tester.yaml +++ b/.github/workflows/staging-image-tester.yaml @@ -2,9 +2,9 @@ name: Build all images on: push: - branches: [ master, rc ] + branches: [ master ] pull_request: - branches: [ master, rc ] + branches: [ master ] permissions: contents: read # to fetch code (actions/checkout) diff --git a/Makefile b/Makefile index 991074a50..d9392e708 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ build.push/multiarch: ko KO_DOCKER_REPO=${IMAGE} \ VERSION=${VERSION} \ ko build --tags ${VERSION} --bare --sbom ${IMG_SBOM} \ - --image-label org.opencontainers.image.source="https://github.com/conduitxyz/external-dns" \ + --image-label org.opencontainers.image.source="https://github.com/kubernetes-sigs/external-dns" \ --image-label org.opencontainers.image.revision=$(shell git rev-parse HEAD) \ --platform=${IMG_PLATFORM} --push=${IMG_PUSH} . diff --git a/charts/external-dns/Chart.yaml b/charts/external-dns/Chart.yaml index 5ee60d55f..7bec0a800 100644 --- a/charts/external-dns/Chart.yaml +++ b/charts/external-dns/Chart.yaml @@ -11,17 +11,15 @@ keywords: - dns - service - ingress -home: https://github.com/conduitxyz/external-dns/ -icon: https://github.com/conduitxyz/external-dns/raw/master/docs/img/external-dns.png +home: https://github.com/kubernetes-sigs/external-dns/ +icon: https://github.com/kubernetes-sigs/external-dns/raw/master/docs/img/external-dns.png sources: - - https://github.com/conduitxyz/external-dns/ + - https://github.com/kubernetes-sigs/external-dns/ maintainers: - name: stevehipwell email: steve.hipwell@gmail.com annotations: artifacthub.io/changes: | - - kind: changed - description: "Updated _ExternalDNS_ image repo to ghcr.io/conduitxyz/external-dns" - kind: added description: "Added `transportservers` resource to ClusterRole when specifying `f5-transportserver` or `f5-virtualserver` as a source." - kind: fixed