Skip to content

Commit 072d166

Browse files
authored
Merge pull request #796 from k-orc/eol-release-1.0-main
EOL release-1.0 branch
2 parents f93850c + bb02396 commit 072d166

6 files changed

Lines changed: 3 additions & 109 deletions

File tree

.github/dependabot.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -43,47 +43,6 @@ updates:
4343
- dependency-name: "k8s.io/*"
4444
update-types: ["version-update:semver-major", "version-update:semver-minor"]
4545
## main branch config ends here
46-
## release-1.0 branch config starts here
47-
# github-actions
48-
- directory: "/"
49-
package-ecosystem: "github-actions"
50-
schedule:
51-
interval: "weekly"
52-
day: "monday"
53-
cooldown:
54-
default-days: 7
55-
target-branch: release-1.0
56-
groups:
57-
all-github-actions:
58-
patterns: [ "*" ]
59-
commit-message:
60-
prefix: ":seedling:"
61-
include: scope
62-
# Go directories
63-
- directories:
64-
- "/"
65-
package-ecosystem: "gomod"
66-
schedule:
67-
interval: "weekly"
68-
day: "monday"
69-
cooldown:
70-
default-days: 7
71-
target-branch: release-1.0
72-
groups:
73-
all-go-mod-patch-and-minor:
74-
patterns: [ "*" ]
75-
update-types: [ "patch", "minor" ]
76-
commit-message:
77-
prefix: ":seedling:"
78-
include: scope
79-
ignore:
80-
# Ignore controller-runtime major and minor bumps as its upgraded manually.
81-
- dependency-name: "sigs.k8s.io/controller-runtime"
82-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
83-
# Ignore k8s major and minor bumps and its transitives modules
84-
- dependency-name: "k8s.io/*"
85-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
86-
## release-1.0 branch config ends here
8746
## release-2.0 branch config starts here
8847
# github-actions
8948
- directory: "/"

.github/labels.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
- color: '30ABB9'
2-
description: This PR will be backported to v1.0
3-
name: backport-v1.0
41
- color: '30ABB9'
52
description: This PR targets v1.0
63
name: v1.0

.github/workflows/backport.yaml

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,68 +9,6 @@ on:
99
permissions: {}
1010

1111
jobs:
12-
backport_v1_0:
13-
name: "Backport to v1.0"
14-
permissions:
15-
contents: read
16-
pull-requests: write
17-
# Only react to merged PRs for security reasons.
18-
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
19-
if: >
20-
github.event.pull_request.merged
21-
&& (
22-
github.event.action == 'closed'
23-
&& contains(github.event.pull_request.labels.*.name, 'backport-v1.0')
24-
|| (
25-
github.event.action == 'labeled'
26-
&& contains(github.event.label.name, 'backport-v1.0')
27-
)
28-
)
29-
runs-on: ubuntu-latest
30-
steps:
31-
- name: Generate a token from the orc-backport-bot github-app
32-
id: generate_token
33-
uses: getsentry/action-github-app-token@5c1e90706fe007857338ac1bfbd7a4177db2f789 # tag=v4.0.0
34-
with:
35-
app_id: ${{ secrets.BACKPORT_APP_ID }} # zizmor: ignore[secrets-outside-env]
36-
private_key: ${{ secrets.BACKPORT_APP_PRIVATE_KEY }} # zizmor: ignore[secrets-outside-env]
37-
38-
- name: Backporting
39-
if: >
40-
contains(github.event.pull_request.labels.*.name, 'semver:patch')
41-
|| contains(github.event.label.name, 'semver:patch')
42-
uses: kiegroup/git-backporting@08da0b07ef2330d189f6074ec8db736b3aa9f465 # tag=v4.9.1
43-
with:
44-
target-branch: release-1.0
45-
pull-request: ${{ github.event.pull_request.url }}
46-
auth: ${{ steps.generate_token.outputs.token }}
47-
no-squash: true
48-
strategy-option: find-renames
49-
50-
- name: Report failure
51-
if: failure()
52-
run: gh issue comment "$NUMBER" --body "$BODY"
53-
env:
54-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55-
GH_REPO: ${{ github.repository }}
56-
NUMBER: ${{ github.event.pull_request.number }}
57-
BODY: >
58-
Failed to backport PR to `release-1.0` branch. See [logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for details.
59-
60-
- name: Report an error if backport unsupported labels
61-
if: >
62-
contains(github.event.pull_request.labels.*.name, 'semver:major')
63-
|| contains(github.event.pull_request.labels.*.name, 'semver:minor')
64-
|| contains(github.event.label.name, 'semver:major')
65-
|| contains(github.event.label.name, 'semver:minor')
66-
run: gh pr comment "$NUMBER" --body "$BODY"
67-
env:
68-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
69-
GH_REPO: ${{ github.repository }}
70-
NUMBER: ${{ github.event.pull_request.number }}
71-
BODY: >
72-
Labels `semver:major` and `semver:minor` block backports to the branch `release-1.0`.
73-
7412
backport_v2_0:
7513
name: "Backport to v2.0"
7614
permissions:

.github/workflows/weekly-security-scan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
branch: [main, release-1.0, release-2.0]
16+
branch: [main, release-2.0]
1717
name: Trivy
1818
runs-on: ubuntu-latest
1919
steps:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ kubectl delete -f $ORC_RELEASE
7171

7272
## Supported OpenStack resources
7373

74-
| **controller** | **1.x** | **2.x** | **main** |
74+
| **controller** | **1.x (EOL)** | **2.x** | **main** |
7575
|:---------------------------:|:-------:|:-------:|:--------:|
7676
| addressscope | |||
7777
| application credential | |||

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
| Version | Supported |
66
| ------- | ------------------ |
77
| < 1.0 | :x: |
8-
| 1.x | :white_check_mark: |
8+
| 1.x | :x: |
99
| 2.x | :white_check_mark: |
1010

1111
## Reporting a Vulnerability

0 commit comments

Comments
 (0)