Update for kubernetes-client-api.version v6.8.1 #39

julieheard · 2023-08-17T14:14:58Z

Downstream of jenkinsci/kubernetes-client-api-plugin#221

When the above PR for kubernetes-client-api-plugin is merged and we get a new release, we need to check the new version number against what I have put in the pom for the version number on this plugin PR.
I have included a dependency on snakeyaml-api 2.0 which is currently not released - PR is here Bump org.yaml:snakeyaml from 1.33 to 2.1 snakeyaml-api-plugin#94. When the new release version for kubernetes-client-api-plugin is sorted, we can re-run tests and check if the snakeyaml 2.0+ dependency is needed. If it is needed, we will also need a release of snakeyaml-api and will need to include that released version in this PR.

I will keep this PR in draft until the PR for kubernetes-client-api is merged and we can check the above points.

Testing done

I ran mvn verify to test locally and all working, all tests passing

Submitter checklist

Give feedback

Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
Ensure that the pull request title represents the desired changelog entry
Please describe what you did
Link to relevant issues in GitHub or Jira
Link to relevant pull requests, esp. upstream and downstream changes
Ensure you have provided tests - that demonstrates feature works or fixes the issue
Options

julieheard · 2023-08-17T14:17:41Z

pom.xml

@@ -3,7 +3,7 @@
  <parent>
    <groupId>org.jenkins-ci.plugins</groupId>
    <artifactId>plugin</artifactId>
-    <version>4.50</version>
+    <version>4.66</version>


I bumped this to 4.66 due to needing a higher version of configuration-as-code-plugin.
Version 1647.ve39ca_b_829b_42 onwards of configuration-as-code includes changes made for the html 3.x update. As you can see further down, I have bumped configuration-as-code to the latest release.

julieheard · 2023-08-17T14:19:26Z

pom.xml

-    <bom.version>1763.v092b_8980a_f5e</bom.version>
+    <jenkins.version>2.401.1</jenkins.version>
+    <bom.artifactId>bom-2.401.x</bom.artifactId>
+    <bom.version>2244.vd60654536b_96</bom.version>


When initially bumping kubernetes-client-api, it needed a dependency on snakeyaml-api 2.0 and Jenkins needed to be at least 2.361.4 or higher.

julieheard · 2023-08-17T14:21:22Z

pom.xml


    <!-- dependency versions -->
    <authentication-tokens.version>1.3</authentication-tokens.version>
    <docker-commons.version>1.15</docker-commons.version>
    <google-oauth-plugin.version>0.8</google-oauth-plugin.version>
-    <kubernetes-client-api.version>6.3.1-206.v76d3b_6b_14db_b</kubernetes-client-api.version>
+    <kubernetes-client-api.version>6.8.1-220.v1f66736f9a_42</kubernetes-client-api.version>


This version number will need to be checked when this PR is merged jenkinsci/kubernetes-client-api-plugin#221 and we have a new release version for kubernetes-client-api. It needs to be at least 6.8.0 to be compatible with the snakeyaml 2.0 changes.

Bump revision from 6.4.1 to 6.8.1 kubernetes-client-api-plugin#221

julieheard · 2023-08-17T14:22:22Z

src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java

-            throw new KubernetesAuthException(e.getMessage(), e);
-        }
+        io.fabric8.kubernetes.api.model.Config kubeConfig = KubeConfigUtils.parseConfigFromString(getKubeconfig());
+        return new io.fabric8.kubernetes.api.model.ConfigBuilder(kubeConfig);


When bumping to version 6.8.1 we had a compilation error on this try catch:
kubernetes-credentials-plugin\src\main\java\org\jenkinsci\plugins\kubernetes\auth\impl\KubernetesAuthKubeconfig.java:[35,10] error: exception IOException is never thrown in body of corresponding try statement

You could change it to catch a general Exception perhaps?

pom.xml

Vlatombe · 2023-08-22T08:56:53Z

Hi @maxlaverse, we are looking into a coordinated releases of the plugins depending on https://github.com/jenkinsci/kubernetes-client-api-plugin (as this project tend to introduce breaking changes regularly). Could you give some indication of your availability to let this happen? Otherwise, would you be okay for a co-maintainership on this plugin?

Co-authored-by: Robert Sandell <rsandell@cloudbees.com>

julieheard · 2023-08-22T10:59:03Z

pom.xml

+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>snakeyaml-api</artifactId>
+      <version>2.1-110.v4960f4074978</version>    


This is the incremental version of snakeyaml-api, needs to be updated when jenkinsci/snakeyaml-api-plugin#94 is merged and released

Bump org.yaml:snakeyaml from 1.33 to 2.1 snakeyaml-api-plugin#94

rsandell · 2023-08-22T13:43:34Z

Looks like the pom needs to be modernised as well? The build error indicates that maven is running with an old jdk?

Perhaps #37 or #38 would fix that?

maxlaverse · 2023-08-22T16:51:58Z

@julieheard , could you merge master into your branch ? I've removed support for Java 8.

Could you give some indication of your availability to let this happen?

I should be able to do the release within 1-2hours lag behind the merge of the downstream PR, on CEST day @Vlatombe. I'm definitely open to co-maintainership for this plugin.

julieheard · 2023-08-22T17:30:34Z

Done, thank you Maxime 🙂

pom.xml

maxlaverse · 2023-08-29T13:32:02Z

I've prepared my local environment for the release but I'm entering a car for ~6hours. I added you as collaborator in case I don't manage to release during a break and you want to have it done earlier @Vlatombe

…ernetes-credentials-plugin into 6.8.1-test-branch

Vlatombe · 2023-08-29T13:41:06Z

Thanks! I just checked that I already have deploy rights to repo.jenkins-ci.org on this plugin, so this should be fine.

Update for kubernetes-client-api.version v6.8.1

f9e7011

julieheard commented Aug 17, 2023

View reviewed changes

This was referenced Aug 17, 2023

Bump revision from 6.4.1 to 6.8.1 jenkinsci/kubernetes-client-api-plugin#221

Merged

Upgrade kubernetes-client-api to 6.8.1 jenkinsci/kubernetes-plugin#1342

Merged

julieheard commented Aug 21, 2023

View reviewed changes

pom.xml Outdated Show resolved Hide resolved

julieheard and others added 2 commits August 22, 2023 10:20

revert try-catch removal and replace with generic exception

ae7becd

update snakeyaml to incremental version

ccba2ae

Co-authored-by: Robert Sandell <rsandell@cloudbees.com>

julieheard commented Aug 22, 2023

View reviewed changes

Merge branch 'jenkinsci:master' into 6.8.1-test-branch

f62dc9e

julieheard added 2 commits August 29, 2023 09:15

Remove snakeyaml-api dependency

209b32a

Change spacing and remove bump to configuration as code

837cce3

Vlatombe reviewed Aug 29, 2023

View reviewed changes

pom.xml Outdated Show resolved Hide resolved

Apply suggestions from code review

3bdb882

Vlatombe added 3 commits August 29, 2023 15:36

Merge branch 'master' into 6.8.1-test-branch

1656100

Merge branch '6.8.1-test-branch' of https://github.com/julieheard/kub…

23eaa92

…ernetes-credentials-plugin into 6.8.1-test-branch

Add okhttp-api to dependencyManagement to fix enforcer rule

37cb4b2

julieheard marked this pull request as ready for review August 29, 2023 13:40

Vlatombe added the enhancement label Aug 29, 2023

Vlatombe merged commit f53d383 into jenkinsci:master Aug 29, 2023
14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update for kubernetes-client-api.version v6.8.1 #39

Update for kubernetes-client-api.version v6.8.1 #39

julieheard commented Aug 17, 2023 •

edited

Loading

Submitter checklist

julieheard Aug 17, 2023

julieheard Aug 17, 2023

julieheard Aug 17, 2023

Vlatombe Aug 25, 2023 •

edited

Loading

julieheard Aug 17, 2023

rsandell Aug 21, 2023

Vlatombe commented Aug 22, 2023

julieheard Aug 22, 2023

Vlatombe Aug 25, 2023 •

edited

Loading

rsandell commented Aug 22, 2023 •

edited

Loading

maxlaverse commented Aug 22, 2023

julieheard commented Aug 22, 2023

maxlaverse commented Aug 29, 2023 •

edited

Loading

Vlatombe commented Aug 29, 2023

Update for kubernetes-client-api.version v6.8.1 #39

Update for kubernetes-client-api.version v6.8.1 #39

Conversation

julieheard commented Aug 17, 2023 • edited Loading

Testing done

Submitter checklist

julieheard Aug 17, 2023

Choose a reason for hiding this comment

julieheard Aug 17, 2023

Choose a reason for hiding this comment

julieheard Aug 17, 2023

Choose a reason for hiding this comment

Vlatombe Aug 25, 2023 • edited Loading

Choose a reason for hiding this comment

julieheard Aug 17, 2023

Choose a reason for hiding this comment

rsandell Aug 21, 2023

Choose a reason for hiding this comment

Vlatombe commented Aug 22, 2023

julieheard Aug 22, 2023

Choose a reason for hiding this comment

Vlatombe Aug 25, 2023 • edited Loading

Choose a reason for hiding this comment

rsandell commented Aug 22, 2023 • edited Loading

maxlaverse commented Aug 22, 2023

julieheard commented Aug 22, 2023

maxlaverse commented Aug 29, 2023 • edited Loading

Vlatombe commented Aug 29, 2023

julieheard commented Aug 17, 2023 •

edited

Loading

Vlatombe Aug 25, 2023 •

edited

Loading

Vlatombe Aug 25, 2023 •

edited

Loading

rsandell commented Aug 22, 2023 •

edited

Loading

maxlaverse commented Aug 29, 2023 •

edited

Loading