Skip to content

Commit 61128db

Browse files
authored
Merge pull request #1692 from yliaog/master
removed docs and scripts around submodules. submodules are no longer
2 parents 36fc461 + c57b1bd commit 61128db

File tree

3 files changed

+9
-119
lines changed

3 files changed

+9
-119
lines changed

Diff for: devel/release.md

+9-17
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ are a higher than expected number of issues there can be multiple releases
1717

1818
## Automated release
1919

20-
### 1. (Optional) Update submodules
21-
22-
Update submodules by referring to this [link](https://github.com/kubernetes-client/python/blob/master/devel/submodules.md#update-submodule). Commit the changes and open a pull request.
23-
24-
### 2. Run the release script and send a PR
20+
### 1. Run the release script and send a PR
2521
Generate a Github personal access token following instruction
2622
[link](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)
2723

@@ -49,11 +45,11 @@ $ KUBERNETES_BRANCH=release-1.${MINOR_VERSION} CLIENT_VERSION=${MINOR_VERSION}.$
4945
Checkout the generated local branch (named "automated-release-of-xxx") to
5046
continue with the remaining steps.
5147

52-
### 3. README (not required for snapshots)
48+
### 2. README (not required for snapshots)
5349

5450
Update the compatibility matrix and maintenance status in the README file.
5551

56-
### 4. Submit pull request
52+
### 3. Submit pull request
5753

5854
For snapshots, create a PR against the master repo.
5955

@@ -62,17 +58,13 @@ For actual releases, create:
6258
- a second PR against the master branch to cherrypick the CHANGELOG and README
6359
changes.
6460

65-
### 5. (Repo admin) Create release branch
61+
### 4. (Repo admin) Create release branch
6662

6763
After merging a new snapshot, create a release branch from the master branch.
6864

6965
## (Deprecated) Manual release
7066

71-
### 1. Update submodules
72-
73-
Update submodules by referring to this [link](https://github.com/kubernetes-client/python/blob/master/devel/submodules.md#update-submodule). Commit the changes and open a pull request.
74-
75-
### 2. Create or update release branch
67+
### 1. Create or update release branch
7668

7769
The release branch name should have release-x.x format. All minor and pre-releases
7870
should be on the same branch. To update an existing branch with master (only for
@@ -89,7 +81,7 @@ git pull -X theirs upstream master
8981
You may need to fix some conflicts. For auto-generated files, you can commit
9082
either version. They will be updated to the current version in the next step.
9183

92-
### 3. Update release tags
84+
### 2. Update release tags
9385

9486
Release tags are in the "scripts/constants.py" file. These are the constants you
9587
may need to update:
@@ -126,7 +118,7 @@ apply the manual fixes.***
126118
git push upstream $RELEASE_BRANCH
127119
```
128120

129-
### 4. Hot issues
121+
### 3. Hot issues
130122

131123
Use the `scripts/apply-hotfixes.sh` script to apply the fixes below in one step.
132124
**As mentioned above, the script should be run after finishing the section "Update release tags". Also, ensure a clean working directory before applying the script.**
@@ -152,15 +144,15 @@ For more details, see [#974](https://github.com/kubernetes-client/python/issues/
152144

153145
5. Add tests for the default `Configuration` behavior (ref: https://github.com/kubernetes-client/python/pull/1303 and https://github.com/kubernetes-client/python/pull/1285). The commit [1ffa61d0650e4c93e0d7f0becd2c54797eafd407](https://github.com/kubernetes-client/python/pull/1285/commits/1ffa61d0650e4c93e0d7f0becd2c54797eafd407) should be cherry-picked.
154146

155-
### 5. CHANGELOG
147+
### 4. CHANGELOG
156148

157149
Make sure the change logs are up to date [here](https://github.com/kubernetes-client/python/blob/master/CHANGELOG.md).
158150
If they are not, follow commits added after the last release and update/commit
159151
the change logs to master.
160152

161153
Then based on the release, follow one of next two steps.
162154

163-
### 6. README
155+
### 5. README
164156

165157
Update the compatibility matrix and maintenance status in the README file.
166158

Diff for: devel/submodules.md

-29
This file was deleted.

Diff for: scripts/update-submodule.sh

-73
This file was deleted.

0 commit comments

Comments
 (0)