Skip to content

Commit 8fe9871

Browse files
authored
Merge pull request #85 from ContainerSolutions/release-with-github-actions
Release with GitHub actions
2 parents 985f1ba + 25a71a7 commit 8fe9871

File tree

2 files changed

+33
-5
lines changed

2 files changed

+33
-5
lines changed

.github/workflows/release.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Release to Maven Central
2+
on:
3+
release:
4+
types: [created]
5+
jobs:
6+
publish:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Set up Maven Central Repository
11+
uses: actions/setup-java@v1
12+
with:
13+
java-version: 1.8
14+
- name: change version to release version
15+
# Assume that RELEASE_VERSION will have form like: "v1.0.1". So we cut the "v"
16+
run: mvn versions:set "${RELEASE_VERSION:1}" versions:commit
17+
env:
18+
RELEASE_VERSION: ${{ github.event.release.tag_name }}
19+
# - name: Release Maven package
20+
# uses: samuelmeuli/action-maven-publish@v1
21+
# with:
22+
# maven_profiles: "release"
23+
# gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
24+
# gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
25+
# nexus_username: ${{ secrets.OSSRH_USERNAME }}
26+
# nexus_password: ${{ secrets.OSSRH_TOKEN }}
27+
- name: Set version to next snapshot version
28+
run: mvn -q build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit
29+
- name: Push changes to master
30+
uses: tcitry/[email protected]

operator-framework/src/main/java/com/github/containersolutions/operator/Operator.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
public class Operator {
2727

2828
private final static Logger log = LoggerFactory.getLogger(Operator.class);
29-
30-
private final Retry defaultRetry = GenericRetry.defaultLimitedExponentialRetry();
3129
private final KubernetesClient k8sClient;
3230
private Map<Class<? extends CustomResource>, CustomResourceOperationsImpl> customResourceClients = new HashMap<>();
3331

@@ -37,15 +35,15 @@ public Operator(KubernetesClient k8sClient) {
3735

3836

3937
public <R extends CustomResource> void registerControllerForAllNamespaces(ResourceController<R> controller) throws OperatorException {
40-
registerController(controller, true, defaultRetry);
38+
registerController(controller, true, GenericRetry.defaultLimitedExponentialRetry());
4139
}
4240

4341
public <R extends CustomResource> void registerControllerForAllNamespaces(ResourceController<R> controller, Retry retry) throws OperatorException {
4442
registerController(controller, true, retry);
4543
}
4644

4745
public <R extends CustomResource> void registerController(ResourceController<R> controller, String... targetNamespaces) throws OperatorException {
48-
registerController(controller, false, defaultRetry, targetNamespaces);
46+
registerController(controller, false, GenericRetry.defaultLimitedExponentialRetry(), targetNamespaces);
4947
}
5048

5149
public <R extends CustomResource> void registerController(ResourceController<R> controller, Retry retry, String... targetNamespaces) throws OperatorException {
@@ -99,7 +97,7 @@ public Map<Class<? extends CustomResource>, CustomResourceOperationsImpl> getCus
9997
return customResourceClients;
10098
}
10199

102-
public <T extends CustomResource, L extends CustomResourceList<T>, D extends CustomResourceDoneable<T>> CustomResourceOperationsImpl<T, L, D>
100+
public <T extends CustomResource, L extends CustomResourceList<T>, D extends CustomResourceDoneable<T>> CustomResourceOperationsImpl<T, L, D>
103101
getCustomResourceClients(Class<T> customResourceClass) {
104102
return customResourceClients.get(customResourceClass);
105103
}

0 commit comments

Comments
 (0)