Skip to content

Commit faacf14

Browse files
Merge pull request #451 from PillaiManish/v1.42.1-rebase-main
OAPE-520: 4.22 chore: Rebase openshift/ocp-release-operator-sdk to upstream operator-framework/operator-sdk v1.42.1
2 parents 514959f + 9de5bfb commit faacf14

673 files changed

Lines changed: 42341 additions & 89603 deletions

File tree

Some content is hidden

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

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.24-openshift-4.22
4+
tag: rhel-9-release-golang-1.25-openshift-4.22

.ci/gpg/README.md

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
# SDK GPG Keys
2+
3+
## Current *key*pers
4+
5+
The keys are currently in the hands of [Joe Lanford](https://github.com/joelanford/).
6+
7+
## Transferring keys
8+
9+
In order to transfer the keys to other members of the Operator SDK admins, following the following:
10+
11+
1. get public GPG key from the person(s) you will transfer to
12+
2. import their key into your keyring
13+
14+
```
15+
gpg --import KEY
16+
```
17+
18+
3. verify their identity, is this really their key. Video call can be useful for this.
19+
4. sign their key
20+
21+
```
22+
gpg --sign-key EMAIL-OF-USERS-KEY
23+
```
24+
25+
5. export the SDK public key
26+
27+
```
28+
gpg --export --armor -o 3B2F1481D146238080B346BB052996E2A20B5C7E.pub .asc 3B2F1481D146238080B346BB052996E2A20B5C7
29+
```
30+
6. export the SDK private key
31+
32+
```
33+
gpg --export-secret-key --armor -o 3B2F1481D146238080B346BB052996E2A2 0B5C7E.priv.asc 3B2F1481D146238080B346BB052996E2A20B5C7E
34+
```
35+
7. export the SDK sub key
36+
37+
```
38+
gpg --export-secret-subkeys --armor -o 3B2F1481D146238080B346BB052996 E2A20B5C7E.sub_priv.asc 3B2F1481D146238080B346BB052996E2A20B5C7E
39+
```
40+
41+
8. encrypt each key for the person
42+
43+
```
44+
gpg --encrypt --sign --armor -r EMAIL-OF-USERS-KEY --output 052996E2A20B5C7E.subkey.private.asc.enc 052996E2A20B5C7E.subkey.private.asc
45+
```
46+
47+
9. send them the encrypted key to the user
48+
49+
10. user should be able to decrypt with their key.
50+
51+
## Updating expiration date
52+
53+
There will be a few people that have the keys. Those people should be able to update the expiration date. This won't have to be done until November 8, 2025.
54+
55+
You will want to update the date of the key:
56+
57+
```
58+
gpg --edit-key (key id)
59+
```
60+
61+
Once you're in the gpg console select the key , there are 2, you need to update both. I just pick a 3 year term.
62+
63+
```
64+
gpg> expire
65+
(follow prompts)
66+
3y
67+
gpg> save
68+
```
69+
70+
You can use whatever term the team wants.
71+
72+
One of the resources I used: [How to change the expiration date of a GPG key](https://www.g-loaded.eu/2010/11/01/change-expiration-date-gpg-key/)
73+
74+
## Sending keys to keyserver
75+
76+
Once you have the keys updated, you should send them to a keyserver. I have a couple examples, not sure if both are needed.
77+
78+
```
79+
gpg --keyserver keyserver.ubuntu.com --send-key 3B2F1481D146238080B346BB052996E2A20B5C7E
80+
gpg --keyserver pgp.mit.edu --send-key 3B2F1481D146238080B346BB052996E2A20B5C7E
81+
```
82+
83+
I *think* you only need to send it to one server, most of the commands in my shell history use `pgp.mit.edu`
84+
85+
## Updating secring.auto.gpg
86+
87+
Once you have the keys updated, you need to regenerate the keyrings that are stored in the [SDK repo](https://github.com/operator-framework/operator-sdk/tree/master/.ci/gpg).
88+
89+
Use the SDK key to sign and encrypt it. You need to use `--local-user` to avoid GPG from using your own key.
90+
91+
```
92+
gpg --cipher-algo AES256 --output secring.auto.gpg --local-user "cncf-operator-sdk@cncf.io" --sign --symmetric 3B2F1481D146238080B346BB052996E2A20B5C7E.sub_priv.asc
93+
```
94+
95+
## Updating pubring.auto
96+
97+
This is the public keyring. It's simply the public key. Export the public key then rename it as `pubring.auto`
98+
99+
```
100+
gpg --export --armor -o 3B2F1481D146238080B346BB052996E2A20B5C7E.pub.asc 3B2F1481D146238080B346BB052996E2A20B5C7E
101+
cp 3B2F1481D146238080B346BB052996E2A20B5C7E.pub.asc pubring.auto
102+
```
103+
104+
## CI usage of keys
105+
106+
The GPG keys are stored in [.ci/gpg](https://github.com/operator-framework/operator-sdk/tree/master/.ci/gpg) of the Operator SDK repo.
107+
108+
In Github settings, there is a `GPG_PASSWORD` environment variable. It is set here in the [Environments](https://github.com/operator-framework/operator-sdk/settings/environments/172302554/edit) tab. You need to be admin.
109+
110+
The `GPG_PASSWORD` has been encrypted and handed to a few people. These people are the keepers of the password.
111+
112+
## Original process
113+
114+
The original keys were setup using the following article.
115+
116+
https://blogs.itemis.com/en/secure-your-travis-ci-releases-part-2-signature-with-openpgp

.github/workflows/deploy.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
outputs:
1919
skip: ${{ steps.check_docs_only.outputs.skip }}
2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222
with:
2323
fetch-depth: 0
2424
- id: check_docs_only
@@ -39,7 +39,7 @@ jobs:
3939
environment: deploy
4040
steps:
4141
- name: checkout
42-
uses: actions/checkout@v5
42+
uses: actions/checkout@v6
4343
with:
4444
fetch-depth: 0
4545

@@ -77,22 +77,22 @@ jobs:
7777
steps:
7878

7979
- name: set up qemu
80-
uses: docker/setup-qemu-action@v3
80+
uses: docker/setup-qemu-action@v4
8181

8282
- name: set up buildx
83-
uses: docker/setup-buildx-action@v3
83+
uses: docker/setup-buildx-action@v4
8484

8585
- name: quay.io login
8686
if: ${{ github.event_name != 'pull_request' }}
87-
uses: docker/login-action@v3
87+
uses: docker/login-action@v4
8888
with:
8989
username: ${{ secrets.QUAY_USERNAME }}
9090
password: ${{ secrets.QUAY_PASSWORD }}
9191
registry: quay.io
9292

9393
# Check out repo before tag step for script.
9494
- name: checkout
95-
uses: actions/checkout@v5
95+
uses: actions/checkout@v6
9696
with:
9797
fetch-depth: 0
9898

@@ -103,7 +103,7 @@ jobs:
103103
echo tags=$(.github/workflows/get_image_tags.sh "$IMG" "v") >> $GITHUB_OUTPUT
104104
105105
- name: build and push
106-
uses: docker/build-push-action@v6
106+
uses: docker/build-push-action@v7
107107
with:
108108
file: ./images/${{ matrix.id }}/Dockerfile
109109
context: .
@@ -123,22 +123,22 @@ jobs:
123123
steps:
124124

125125
- name: set up qemu
126-
uses: docker/setup-qemu-action@v3
126+
uses: docker/setup-qemu-action@v4
127127

128128
- name: set up buildx
129-
uses: docker/setup-buildx-action@v3
129+
uses: docker/setup-buildx-action@v4
130130

131131
- name: quay.io login
132132
if: ${{ github.event_name != 'pull_request' }}
133-
uses: docker/login-action@v3
133+
uses: docker/login-action@v4
134134
with:
135135
username: ${{ secrets.QUAY_USERNAME }}
136136
password: ${{ secrets.QUAY_PASSWORD }}
137137
registry: quay.io
138138

139139
# Check out repo before tag step for script.
140140
- name: checkout
141-
uses: actions/checkout@v5
141+
uses: actions/checkout@v6
142142
with:
143143
fetch-depth: 0
144144

@@ -149,7 +149,7 @@ jobs:
149149
echo tags=$(.github/workflows/get_image_tags.sh "$IMG" "scorecard-kuttl/v") >> $GITHUB_OUTPUT
150150
151151
- name: build and push
152-
uses: docker/build-push-action@v6
152+
uses: docker/build-push-action@v7
153153
with:
154154
file: ./images/scorecard-test-kuttl/Dockerfile
155155
context: .

.github/workflows/freshen-images.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
git_tags: ${{ steps.tags.outputs.git_tags }}
1919
steps:
2020
- name: checkout
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
with:
2323
fetch-depth: 0
2424
- id: tags
@@ -35,17 +35,17 @@ jobs:
3535
id: ["operator-sdk", "helm-operator", "scorecard-test"]
3636
steps:
3737
- name: set up qemu
38-
uses: docker/setup-qemu-action@v3
38+
uses: docker/setup-qemu-action@v4
3939
- name: set up buildx
40-
uses: docker/setup-buildx-action@v3
40+
uses: docker/setup-buildx-action@v4
4141
- name: quay.io login
42-
uses: docker/login-action@v3
42+
uses: docker/login-action@v4
4343
with:
4444
username: ${{ secrets.QUAY_USERNAME }}
4545
password: ${{ secrets.QUAY_PASSWORD }}
4646
registry: quay.io
4747
- name: checkout
48-
uses: actions/checkout@v5
48+
uses: actions/checkout@v6
4949
with:
5050
fetch-depth: 1
5151
- name: build and push

.github/workflows/integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
outputs:
1010
skip: ${{ steps.check_docs_only.outputs.skip }}
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
with:
1414
fetch-depth: 0
1515
- id: check_docs_only
@@ -26,7 +26,7 @@ jobs:
2626
needs: check_docs_only
2727
if: needs.check_docs_only.outputs.skip != 'true'
2828
steps:
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
3030
with:
3131
fetch-depth: 0
3232

.github/workflows/olm-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: check-olm-minor-releases
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
- id: run-check-olm
1717
run: ./hack/check-olm.sh
1818

.github/workflows/test-go.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
outputs:
1313
skip: ${{ steps.check_docs_only.outputs.skip }}
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
with:
1717
fetch-depth: 0
1818
- id: check_docs_only
@@ -29,7 +29,7 @@ jobs:
2929
needs: check_docs_only
3030
if: needs.check_docs_only.outputs.skip != 'true'
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
with:
3434
fetch-depth: 0
3535

@@ -49,7 +49,7 @@ jobs:
4949
needs: check_docs_only
5050
if: needs.check_docs_only.outputs.skip != 'true'
5151
steps:
52-
- uses: actions/checkout@v5
52+
- uses: actions/checkout@v6
5353
with:
5454
fetch-depth: 0
5555

.github/workflows/test-helm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
outputs:
1010
skip: ${{ steps.check_docs_only.outputs.skip }}
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
with:
1414
fetch-depth: 0
1515
- id: check_docs_only
@@ -26,7 +26,7 @@ jobs:
2626
needs: check_docs_only
2727
if: needs.check_docs_only.outputs.skip != 'true'
2828
steps:
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
3030
with:
3131
fetch-depth: 0
3232

.github/workflows/test-sample-go.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
outputs:
1010
skip: ${{ steps.check_docs_only.outputs.skip }}
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
with:
1414
fetch-depth: 0
1515
- id: check_docs_only
@@ -26,7 +26,7 @@ jobs:
2626
needs: check_docs_only
2727
if: needs.check_docs_only.outputs.skip != 'true'
2828
steps:
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
3030
with:
3131
fetch-depth: 0
3232

.github/workflows/test-sanity.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
outputs:
1010
skip: ${{ steps.check_docs_only.outputs.skip }}
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
with:
1414
fetch-depth: 0
1515
- id: check_docs_only
@@ -26,7 +26,7 @@ jobs:
2626
needs: check_docs_only
2727
if: needs.check_docs_only.outputs.skip != 'true'
2828
steps:
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
3030
with:
3131
fetch-depth: 0
3232

@@ -45,7 +45,7 @@ jobs:
4545
name: docs
4646
runs-on: ubuntu-24.04
4747
steps:
48-
- uses: actions/checkout@v5
48+
- uses: actions/checkout@v6
4949
with:
5050
fetch-depth: 0
5151
submodules: recursive

0 commit comments

Comments
 (0)