Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1925524: Migrate to shared informers and watchers removed #386

Merged
merged 23 commits into from Jun 29, 2021
Merged

Bug 1925524: Migrate to shared informers and watchers removed #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fd04171
Migrate to kubernetes-client 5.2.1
akram Mar 18, 2021
ba3ffc5
OpenShift Sync Plugin with kubernetes-client 5.2.1
akram Apr 6, 2021
fd17003
stop and start a single watcher after onclose
jkhelil Apr 6, 2021
3361a3e
Adding logs
akram Apr 6, 2021
955f325
Merge branch '5.2.1-beta' of github.com:akram/jenkins-sync-plugin int…
akram Apr 6, 2021
2f9f065
Simplify and cleanup all closes
akram Apr 7, 2021
23c2c8f
Evaluating migration to informer
akram Apr 7, 2021
d0f1044
Clean up code from BasePluginConfiguration
akram Apr 7, 2021
7c7f40e
Adding NPE check for restart cases
akram Apr 7, 2021
0d23475
Basic informer for ConfigMap works
akram Apr 7, 2021
09038cc
Cleanup PodTemplateUtils to remove reference to BaseWatcher. Clean lo…
akram Apr 8, 2021
5b3b29a
Migrated all watchers into informers
akram Apr 8, 2021
e01afc6
Informer implementation working + migrating informers to slf4j
akram Apr 12, 2021
d593106
Cluster Shared Informers
akram Apr 15, 2021
1e4d1dd
Add cluster mode
akram Apr 26, 2021
eee77f5
Remove watchers
akram Apr 26, 2021
2391780
Simple refactors
akram Apr 27, 2021
25472e1
NPE on stop
akram Apr 30, 2021
d6a986f
Use kubernetes-client-api 5.4.1-beta-1
akram Jun 2, 2021
5f34c2d
Use rc for kubernetes 1.30 plugin
akram Jun 15, 2021
f530414
Upgrade jenkins bom version
akram Jun 15, 2021
7670cd8
Change bom to 2.277
akram Jun 15, 2021
c68d9fb
Remove dependency to openshift-client
akram Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 18 additions & 19 deletions pom.xml
View file
Open in desktop
Expand Up @@ -22,10 +22,10 @@
<spotbugs.failOnError>false</spotbugs.failOnError>
<animal.sniffer.skip>true</animal.sniffer.skip>
<enforcer.skip>true</enforcer.skip>
<jenkins.version>2.263</jenkins.version>
<jenkins.version>2.289.1</jenkins.version>
<java.level>8</java.level>
<jenkins-test-harness.version>2.71</jenkins-test-harness.version>
<openshift-client.version>4.13.2</openshift-client.version>
<openshift-client.version>5.4.1</openshift-client.version>
<log.level>DEBUG</log.level>
<findbugs-maven-plugin.version>3.0.4</findbugs-maven-plugin.version>
<findbugs.failOnError>false</findbugs.failOnError>
Expand Down Expand Up @@ -68,6 +68,10 @@
</scm>

<repositories>
<repository>
<id>incremental-repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/incrementals/</url>
</repository>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
Expand Down Expand Up @@ -127,11 +131,6 @@
<artifactId>blueocean-rest</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>com.openshift.jenkins.plugins</groupId>
<artifactId>openshift-client</artifactId>
<version>1.0.34</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.pipeline-stage-view</groupId>
<artifactId>pipeline-rest-api</artifactId>
Expand All @@ -141,11 +140,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
Expand All @@ -157,14 +152,18 @@
<dependency>
<groupId>org.csanchez.jenkins.plugins</groupId>
<artifactId>kubernetes</artifactId>
<version>1.29.0</version>
<version>1.30.0</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>4.13.2</version>
<scope>provided</scope>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>kubernetes-client-api</artifactId>
<version>5.4.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>jackson2-api</artifactId>
<version>2.12.3</version>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand All @@ -177,8 +176,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.263.x</artifactId>
<version>21</version>
<artifactId>bom-2.277.x</artifactId>
<version>26</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/io/fabric8/jenkins/openshiftsync/Annotations.java
View file
Open in desktop
Expand Up @@ -18,11 +18,11 @@
/**
*/
public class Annotations {
public static final String JENKINS_JOB_PATH = "jenkins.openshift.io/job-path";
public static final String GENERATED_BY = "jenkins.openshift.io/generated-by";
public static final String GENERATED_BY_JENKINS = "jenkins";
public static final String DISABLE_SYNC_CREATE = "jenkins.openshift.io/disable-sync-create";
public static final String BUILDCONFIG_NAME = "openshift.io/build-config.name";
public static final String SECRET_NAME = "jenkins.openshift.io/secret.name";
public static final String AUTOSTART = "jenkins.openshift.io/autostart";
public static final String JENKINS_JOB_PATH = "jenkins.openshift.io/job-path";
public static final String GENERATED_BY = "jenkins.openshift.io/generated-by";
public static final String GENERATED_BY_JENKINS = "jenkins";
public static final String DISABLE_SYNC_CREATE = "jenkins.openshift.io/disable-sync-create";
public static final String BUILDCONFIG_NAME = "openshift.io/build-config.name";
public static final String SECRET_NAME = "jenkins.openshift.io/secret.name";
public static final String AUTOSTART = "jenkins.openshift.io/autostart";
}
166 changes: 0 additions & 166 deletions src/main/java/io/fabric8/jenkins/openshiftsync/BaseWatcher.java
View file
Open in desktop

This file was deleted.