diff --git a/.github/workflows/master-mirrors-main.yaml b/.github/workflows/master-mirrors-main.yaml deleted file mode 100644 index bdb3d150f..000000000 --- a/.github/workflows/master-mirrors-main.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: 'sync master with main' - -on: - push: - branches: - - 'main' - -jobs: - push-master: - timeout-minutes: 30 - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - fetch-depth: 0 - - name: Push HEAD to master - # Deliberately not force-pushing: designed to fail if this would mean rewriting history - run: | - git push origin HEAD:master diff --git a/.github/workflows/release-pr.yaml b/.github/workflows/release-pr.yaml index 55a9f408e..a227a79cb 100644 --- a/.github/workflows/release-pr.yaml +++ b/.github/workflows/release-pr.yaml @@ -22,7 +22,7 @@ jobs: ensure-actions-sha-pin: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: zgosalvez/github-actions-ensure-sha-pinned-actions@c3a2b64f69b7a1542a68f44d9edbd9ec3fc1455e # v3.0.20 lint: @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2.2.2 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11 with: @@ -56,7 +56,7 @@ jobs: - gateway-operator steps: - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2.2.2 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 @@ -116,7 +116,7 @@ jobs: - gateway-operator steps: - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2.2.2 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: setup helm uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0 @@ -157,7 +157,7 @@ jobs: - ingress steps: - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2.2.2 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: setup helm uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0 @@ -184,7 +184,7 @@ jobs: name: golden-tests steps: - name: checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2.2.2 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: setup helm uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0 diff --git a/charts/kong/example-values/minimal-kong-enterprise-dbless.yaml b/charts/kong/example-values/minimal-kong-enterprise-dbless.yaml index c2c83bb1f..f2ed23e64 100644 --- a/charts/kong/example-values/minimal-kong-enterprise-dbless.yaml +++ b/charts/kong/example-values/minimal-kong-enterprise-dbless.yaml @@ -8,7 +8,7 @@ image: enterprise: enabled: true - # See instructions regarding enterprise licenses at https://github.com/Kong/charts/blob/master/charts/kong/README.md#kong-enterprise-license + # See instructions regarding enterprise licenses at https://github.com/Kong/charts/blob/main/charts/kong/README.md#kong-enterprise-license license_secret: kong-enterprise-license # CHANGEME vitals: enabled: false diff --git a/charts/kong/example-values/minimal-kong-enterprise-hybrid-control.yaml b/charts/kong/example-values/minimal-kong-enterprise-hybrid-control.yaml index 89dfab0fd..bbc4a0d92 100644 --- a/charts/kong/example-values/minimal-kong-enterprise-hybrid-control.yaml +++ b/charts/kong/example-values/minimal-kong-enterprise-hybrid-control.yaml @@ -54,7 +54,7 @@ ingressController: enterprise: enabled: true - # See instructions regarding enterprise licenses at https://github.com/Kong/charts/blob/master/charts/kong/README.md#kong-enterprise-license + # See instructions regarding enterprise licenses at https://github.com/Kong/charts/blob/main/charts/kong/README.md#kong-enterprise-license license_secret: kong-enterprise-license # CHANGEME vitals: enabled: false diff --git a/charts/kong/example-values/minimal-kong-enterprise-hybrid-data.yaml b/charts/kong/example-values/minimal-kong-enterprise-hybrid-data.yaml index ac66f18ef..8826f1612 100644 --- a/charts/kong/example-values/minimal-kong-enterprise-hybrid-data.yaml +++ b/charts/kong/example-values/minimal-kong-enterprise-hybrid-data.yaml @@ -30,7 +30,7 @@ ingressController: enterprise: enabled: true - # See instructions regarding enterprise licenses at https://github.com/Kong/charts/blob/master/charts/kong/README.md#kong-enterprise-license + # See instructions regarding enterprise licenses at https://github.com/Kong/charts/blob/main/charts/kong/README.md#kong-enterprise-license license_secret: kong-enterprise-license # CHANGEME vitals: enabled: false