Skip to content

Commit 45585f8

Browse files
coreydaleycoreydaley
authored
Merge pull request #114 from openshift/master
sync with openshift/jenkins-sync-plugin
2 parents 95fa27a + 83ac37a commit 45585f8

File tree

655 files changed

+47245
-29269
lines changed

Some content is hidden

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

655 files changed

+47245
-29269
lines changed

‎.ci-operator.yaml

+1-1
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-8-release-golang-1.20-openshift-4.14
4+
tag: rhel-8-release-golang-1.21-openshift-4.16

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ all: test-e2e
33

44

55
test-e2e:
6+
oc version
7+
go version
68
hack/tag-ci-image.sh
79
KUBERNETES_CONFIG=${KUBECONFIG} go test -timeout 75m -v ./test/e2e/...
810

911
verify:
1012
hack/verify.sh
11-
12-

‎go.mod

+25-26
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
module github.com/openshift/jenkins-sync-plugin
22

3-
go 1.20
3+
go 1.21
44

55
require (
6-
github.com/openshift/api v0.0.0-20230810152202-3e3f07aadec4
7-
github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb
8-
k8s.io/api v0.27.4
9-
k8s.io/apimachinery v0.27.4
10-
k8s.io/client-go v0.27.4
6+
github.com/davecgh/go-spew v1.1.1
7+
github.com/openshift/api v0.0.0-20240116232628-6d48d55c0598
8+
github.com/openshift/client-go v0.0.0-20240115204758-e6bf7d631d5e
9+
k8s.io/api v0.29.0
10+
k8s.io/apimachinery v0.29.0
11+
k8s.io/client-go v0.29.0
1112
)
1213

1314
require (
14-
github.com/davecgh/go-spew v1.1.1 // indirect
15-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
16-
github.com/go-logr/logr v1.2.4 // indirect
15+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
16+
github.com/go-logr/logr v1.3.0 // indirect
1717
github.com/go-openapi/jsonpointer v0.19.6 // indirect
18-
github.com/go-openapi/jsonreference v0.20.1 // indirect
18+
github.com/go-openapi/jsonreference v0.20.2 // indirect
1919
github.com/go-openapi/swag v0.22.3 // indirect
2020
github.com/gogo/protobuf v1.3.2 // indirect
2121
github.com/golang/protobuf v1.5.3 // indirect
22-
github.com/google/gnostic v0.5.7-v3refs // indirect
23-
github.com/google/go-cmp v0.5.9 // indirect
22+
github.com/google/gnostic-models v0.6.8 // indirect
2423
github.com/google/gofuzz v1.2.0 // indirect
2524
github.com/google/uuid v1.3.0 // indirect
2625
github.com/imdario/mergo v0.3.6 // indirect
@@ -31,28 +30,28 @@ require (
3130
github.com/modern-go/reflect2 v1.0.2 // indirect
3231
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3332
github.com/spf13/pflag v1.0.5 // indirect
34-
golang.org/x/net v0.10.0 // indirect
35-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
36-
golang.org/x/sys v0.8.0 // indirect
37-
golang.org/x/term v0.8.0 // indirect
38-
golang.org/x/text v0.9.0 // indirect
39-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
33+
golang.org/x/net v0.17.0 // indirect
34+
golang.org/x/oauth2 v0.10.0 // indirect
35+
golang.org/x/sys v0.13.0 // indirect
36+
golang.org/x/term v0.13.0 // indirect
37+
golang.org/x/text v0.13.0 // indirect
38+
golang.org/x/time v0.3.0 // indirect
4039
google.golang.org/appengine v1.6.7 // indirect
41-
google.golang.org/protobuf v1.28.1 // indirect
40+
google.golang.org/protobuf v1.31.0 // indirect
4241
gopkg.in/inf.v0 v0.9.1 // indirect
4342
gopkg.in/yaml.v2 v2.4.0 // indirect
4443
gopkg.in/yaml.v3 v3.0.1 // indirect
45-
k8s.io/klog/v2 v2.100.1 // indirect
46-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
47-
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
44+
k8s.io/klog/v2 v2.110.1 // indirect
45+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
46+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
4847
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
49-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
48+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
5049
sigs.k8s.io/yaml v1.3.0 // indirect
5150
)
5251

5352
replace (
54-
k8s.io/api => k8s.io/api v0.27.4
55-
k8s.io/apimachinery => k8s.io/apimachinery v0.27.4
56-
k8s.io/client-go => k8s.io/client-go v0.27.4
53+
k8s.io/api => k8s.io/api v0.29.0
54+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
55+
k8s.io/client-go => k8s.io/client-go v0.29.0
5756

5857
)

‎go.sum

+57-385
Large diffs are not rendered by default.

‎pom.xml

+68-37
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.jenkins-ci.plugins</groupId>
1313
<artifactId>plugin</artifactId>
14-
<version>4.69</version>
14+
<version>4.77</version>
1515
<relativePath />
1616
</parent>
1717
<groupId>io.fabric8.jenkins.plugins</groupId>
@@ -22,7 +22,7 @@
2222
<properties>
2323
<revision>1.1.0</revision>
2424
<changelist>999999-SNAPSHOT</changelist>
25-
<jenkins.version>2.401.1</jenkins.version>
25+
<jenkins.version>2.426.2</jenkins.version>
2626
<log.level>INFO</log.level>
2727
</properties>
2828

@@ -85,72 +85,77 @@
8585
<dependency>
8686
<groupId>org.jenkins-ci.plugins.workflow</groupId>
8787
<artifactId>workflow-multibranch</artifactId>
88-
<version>756.v891d88f2cd46</version>
8988
</dependency>
9089
<dependency>
91-
<groupId>org.jenkins-ci.plugins</groupId>
92-
<artifactId>script-security</artifactId>
93-
<version>1251.vfe552ed55f8d</version>
90+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
91+
<artifactId>workflow-support</artifactId>
9492
</dependency>
9593
<dependency>
96-
<groupId>joda-time</groupId>
97-
<artifactId>joda-time</artifactId>
98-
<version>2.12.5</version>
94+
<groupId>org.jenkins-ci.plugins.pipeline-stage-view</groupId>
95+
<artifactId>pipeline-rest-api</artifactId>
9996
</dependency>
10097
<dependency>
10198
<groupId>org.jenkins-ci.plugins</groupId>
10299
<artifactId>git</artifactId>
103-
<version>5.1.0</version>
104100
</dependency>
105101
<dependency>
106-
<groupId>io.jenkins.blueocean</groupId>
107-
<artifactId>blueocean-rest</artifactId>
108-
<version>1.27.4</version>
102+
<groupId>joda-time</groupId>
103+
<artifactId>joda-time</artifactId>
109104
</dependency>
110105
<dependency>
111-
<groupId>org.jenkins-ci.plugins.pipeline-stage-view</groupId>
112-
<artifactId>pipeline-rest-api</artifactId>
113-
<version>2.33</version>
106+
<groupId>io.jenkins.blueocean</groupId>
107+
<artifactId>blueocean-rest</artifactId>
114108
</dependency>
115109
<dependency>
116110
<groupId>org.csanchez.jenkins.plugins</groupId>
117111
<artifactId>kubernetes</artifactId>
118-
<version>3923.v294a_d4250b_91</version>
119112
</dependency>
120113
</dependencies>
121114

122115
<dependencyManagement>
123116
<dependencies>
124-
<!-- https://mvnrepository.com/artifact/io.jenkins.tools.bom/bom-2.303.x -->
117+
<!-- https://mvnrepository.com/artifact/io.jenkins.tools.bom/bom-2.426.x -->
125118
<dependency>
126119
<groupId>io.jenkins.tools.bom</groupId>
127-
<artifactId>bom-2.401.x</artifactId>
128-
<version>2244.vd60654536b_96</version>
120+
<artifactId>bom-2.426.x</artifactId>
121+
<version>2705.vf5c48c31285b_</version>
122+
<scope>import</scope>
129123
<type>pom</type>
130124
</dependency>
131-
<!-- https://mvnrepository.com/artifact/io.jenkins.plugins/snakeyaml-api -->
132125
<dependency>
133-
<groupId>io.jenkins.plugins</groupId>
134-
<artifactId>snakeyaml-api</artifactId>
135-
<version>2.0-100.v5c28c7cb_1e67</version>
126+
<groupId>joda-time</groupId>
127+
<artifactId>joda-time</artifactId>
128+
<version>2.12.5</version>
136129
</dependency>
137-
<!-- https://mvnrepository.com/artifact/org.jenkins-ci.plugins.workflow/workflow-job -->
138130
<dependency>
139131
<groupId>org.jenkins-ci.plugins.workflow</groupId>
140-
<artifactId>workflow-job</artifactId>
141-
<version>1316.vd2290d3341a_f</version>
132+
<artifactId>workflow-multibranch</artifactId>
133+
<version>773.vc4fe1378f1d5</version>
142134
</dependency>
143-
<!-- https://mvnrepository.com/artifact/io.jenkins.plugins/ionicons-api -->
144135
<dependency>
145-
<groupId>io.jenkins.plugins</groupId>
146-
<artifactId>ionicons-api</artifactId>
147-
<version>57.v70787cec562e</version>
136+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
137+
<artifactId>workflow-support</artifactId>
138+
<version>865.v43e78cc44e0d</version>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.jenkins-ci.plugins.pipeline-stage-view</groupId>
142+
<artifactId>pipeline-rest-api</artifactId>
143+
<version>2.34</version>
148144
</dependency>
149-
<!-- https://mvnrepository.com/artifact/org.jenkins-ci.plugins/jackson2-api -->
150145
<dependency>
151146
<groupId>org.jenkins-ci.plugins</groupId>
152-
<artifactId>jackson2-api</artifactId>
153-
<version>2.15.2-350.v0c2f3f8fc595</version>
147+
<artifactId>git</artifactId>
148+
<version>5.2.1</version>
149+
</dependency>
150+
<dependency>
151+
<groupId>io.jenkins.blueocean</groupId>
152+
<artifactId>blueocean-rest</artifactId>
153+
<version>1.27.9</version>
154+
</dependency>
155+
<dependency>
156+
<groupId>org.csanchez.jenkins.plugins</groupId>
157+
<artifactId>kubernetes</artifactId>
158+
<version>4174.v4230d0ccd951</version>
154159
</dependency>
155160
</dependencies>
156161
</dependencyManagement>
@@ -170,13 +175,16 @@
170175
<plugin>
171176
<groupId>com.github.spotbugs</groupId>
172177
<artifactId>spotbugs-maven-plugin</artifactId>
173-
<version>4.7.3.5</version>
178+
<version>4.8.2.0</version>
179+
<configuration>
180+
<failOnError>false</failOnError>
181+
</configuration>
174182
<dependencies>
175183
<!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
176184
<dependency>
177185
<groupId>com.github.spotbugs</groupId>
178186
<artifactId>spotbugs</artifactId>
179-
<version>4.7.3</version>
187+
<version>4.8.3</version>
180188
</dependency>
181189
</dependencies>
182190
</plugin>
@@ -238,6 +246,29 @@
238246
</mapping>
239247
</configuration>
240248
</plugin>
249+
<plugin>
250+
<groupId>org.apache.maven.plugins</groupId>
251+
<artifactId>maven-enforcer-plugin</artifactId>
252+
<version>3.4.1</version>
253+
<executions>
254+
<execution>
255+
<id>enforce-no-snapshots</id>
256+
<goals>
257+
<goal>enforce</goal>
258+
</goals>
259+
<configuration>
260+
<rules>
261+
<banDuplicatePomDependencyVersions />
262+
<requireReleaseDeps>
263+
<message>No Snapshots Allowed!</message>
264+
</requireReleaseDeps>
265+
</rules>
266+
<fail>true</fail>
267+
</configuration>
268+
</execution>
269+
</executions>
270+
</plugin>
271+
241272
</plugins>
242273
</build>
243274
<profiles>
@@ -262,7 +293,7 @@
262293
<plugin>
263294
<groupId>org.apache.maven.plugins</groupId>
264295
<artifactId>maven-enforcer-plugin</artifactId>
265-
<version>3.3.0</version>
296+
<version>3.4.1</version>
266297
<executions>
267298
<execution>
268299
<id>enforce-no-snapshots</id>

‎src/main/java/io/fabric8/jenkins/openshiftsync/OpenShiftUtils.java

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import com.fasterxml.jackson.databind.ObjectMapper;
5353
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
5454

55+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
5556
import hudson.BulkChange;
5657
import hudson.model.Item;
5758
import hudson.model.ItemGroup;
@@ -685,6 +686,7 @@ abstract class StatelessReplicationControllerMixIn extends ReplicationController
685686
@JsonIgnore
686687
private ReplicationControllerStatus status;
687688

689+
@SuppressFBWarnings(value="SIC_INNER_SHOULD_BE_STATIC")
688690
StatelessReplicationControllerMixIn() {
689691
}
690692

@@ -706,6 +708,7 @@ abstract class ObjectMetaMixIn extends ObjectMeta {
706708
@JsonIgnore
707709
private String uid;
708710

711+
@SuppressFBWarnings(value="SIC_INNER_SHOULD_BE_STATIC")
709712
ObjectMetaMixIn() {
710713
}
711714

‎test/e2e/sync_plugin_test.go

+10-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import (
2525
"k8s.io/apimachinery/pkg/util/validation"
2626
"k8s.io/apimachinery/pkg/util/wait"
2727
"k8s.io/apimachinery/pkg/watch"
28+
29+
"github.com/davecgh/go-spew/spew"
2830
)
2931

3032
const (
@@ -120,7 +122,7 @@ func instantiateTemplate(ta *testArgs) {
120122
}
121123

122124
default:
123-
ta.t.Logf("unexpected event type %s: %#v", string(event.Type), event.Object)
125+
ta.t.Logf("unexpected event type %s: %#v", string(event.Type), spew.Sdump(event.Object))
124126
}
125127
}
126128

@@ -1146,7 +1148,12 @@ func TestBlueGreen(t *testing.T) {
11461148
buildAndSwitch("blue")
11471149
}
11481150

1149-
func TestPersistentVolumes(t *testing.T) {
1151+
/*
1152+
Failing due to more restrictive Security Policies in newer OCP versions
1153+
It is unlikely that we will reenable this test without a drastic overhaul
1154+
*/
1155+
/*
1156+
func TestPersistentVolumes(t *testing.T) {
11501157
ta := &testArgs{t: t}
11511158
setupClients(ta.t)
11521159
randomTestNamespaceName := generateName(testNamespace)
@@ -1258,3 +1265,4 @@ func TestPersistentVolumes(t *testing.T) {
12581265
}
12591266
12601267
}
1268+
*/

‎vendor/github.com/davecgh/go-spew/spew/bypass.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/davecgh/go-spew/spew/bypasssafe.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)