Add Openshift 4.17 (GA)…

… and fix `oc` 4.16 😅

Signed-off-by: Vincent Demeester <[email protected]>

overlays/openshift.nix

@@ -36,6 +36,7 @@ in
     oc_4_14
     oc_4_15
     oc_4_16
+    oc_4_17
     oc
     ;
   oc-git = mkGitOc "oc-git" ../repos/oc-master.json { };
@@ -44,6 +45,7 @@ in
     openshift-install_4_14
     openshift-install_4_15
     openshift-install_4_16
+    openshift-install_4_17
     openshift-install
     # master based build
     # openshift-install-git

packages/oc.nix

@@ -55,9 +55,12 @@ rec {
       '';
     };
 
-  oc = oc_4_16;
+  oc = oc_4_17;
+  oc_4_17 = makeOverridable ocGen {
+    versionData = versionsMeta."4.17";
+  };
   oc_4_16 = makeOverridable ocGen {
-    versionData = versionsMeta."4.15";
+    versionData = versionsMeta."4.16";
   };
   oc_4_15 = makeOverridable ocGen {
     versionData = versionsMeta."4.15";

packages/openshift-install.nix

@@ -61,7 +61,10 @@ rec {
       };
     };
 
-  openshift-install = openshift-install_4_16;
+  openshift-install = openshift-install_4_17;
+  openshift-install_4_17 = makeOverridable openshiftInstallGen {
+    versionData = versionsMeta."4.17";
+  };
   openshift-install_4_16 = makeOverridable openshiftInstallGen {
     versionData = versionsMeta."4.16";
   };

repos/oc-master.json

@@ -1 +1 @@
-{"type": "github", "owner": "openshift", "repo": "oc", "rev": "02786574b09edc1bc4ec2361d8056c1d57ae97c0", "sha256": "057hqh63nnqvds5z9h2cdqbng4chwn7bzd5wnc8dwzyvw0akhl56", "version": "20240927.0"}
+{"type": "github", "owner": "openshift", "repo": "oc", "rev": "6bba0756103a7df8a126920ecc35dbcd7915d167", "sha256": "0ggrmzbivk8dn38k20dc17z3ipxrlxzbggjlzi7fl73ikmf23rnj", "version": "20241001.0"}

repos/oc.json

@@ -1 +1 @@
-{"4.13":{"darwin":{"aarch64":"1x6c7a80m42ziiil1wlbx4j5xf29zp5967dr4wr8argi6p73cncf","x86_64":"0ll54a7ni948g6kx6n882l2zh8hf1bmssn58i8215vzd4n2n3b0r"},"linux":{"aarch64":"0ypbbibdmr8n2jmf5y5z1fxk4ny9dkizyvch3vsj31xkcr4nwf83","x86_64":"1dvs6nzmanl6x0573igsihdkv1227r9hhxylilj7z5p0flfk9g4d"},"version":"4.13.51"},"4.14":{"darwin":{"aarch64":"0zxs5n4xy4qaqn5n1lkishqrjgr6ifhjbra5ipfhzc9ki1rbhlll","x86_64":"0r1fx4lhbd5ka26ym3li1cbga55l5djxfdvclsfharzi3z5879l8"},"linux":{"aarch64":"08rc71pxrkkqbxwh2qhpk1jnzvipfbzabv4k0w9kqh8n4b7pwbld","x86_64":"0kbcl3h75nh1wd05qhqh1wxs4244bv5f60frzpsivcz68c6falpb"},"version":"4.14.38"},"4.15":{"darwin":{"aarch64":"0c4gnhfikl2gfrgsrmwzb2k82gvq76s0nmn0xlvksslyig020z0w","x86_64":"0rlxdsqhr6n396kvqrb4q6iki2ajyxdjiikxj3jhxl7vg3k42f93"},"linux":{"aarch64":"15fsj98f5xifpiplp0znkbf0ry55qyfd2bv72qcgy01afj24m9lg","x86_64":"08jjaq8b66pxds8b76x4ifbhzljbjsndmz9va1py6bvgg8akcnbr"},"version":"4.15.35"},"4.16":{"darwin":{"aarch64":"0pj28xzy685hs4pxb3z19msiy0a7d9jk9sf4k24lyd6qdhn5cymw","x86_64":"13sqb8sdxszh0dcqv0zvhk8arxhy0v00dqqrp6f76899ppibb5ys"},"linux":{"aarch64":"0z4jdqh3kmng6c155kamqifigq7jgj53920nhfcqasrv46wm2h54","x86_64":"0s7h1z0j9fxaw0s18lx7mzhmf6dp10pzpkp25vrwhb4jb788dhci"},"version":"4.16.15"}}
+{"4.13":{"darwin":{"aarch64":"1x6c7a80m42ziiil1wlbx4j5xf29zp5967dr4wr8argi6p73cncf","x86_64":"0ll54a7ni948g6kx6n882l2zh8hf1bmssn58i8215vzd4n2n3b0r"},"linux":{"aarch64":"0ypbbibdmr8n2jmf5y5z1fxk4ny9dkizyvch3vsj31xkcr4nwf83","x86_64":"1dvs6nzmanl6x0573igsihdkv1227r9hhxylilj7z5p0flfk9g4d"},"version":"4.13.51"},"4.14":{"darwin":{"aarch64":"0zxs5n4xy4qaqn5n1lkishqrjgr6ifhjbra5ipfhzc9ki1rbhlll","x86_64":"0r1fx4lhbd5ka26ym3li1cbga55l5djxfdvclsfharzi3z5879l8"},"linux":{"aarch64":"08rc71pxrkkqbxwh2qhpk1jnzvipfbzabv4k0w9kqh8n4b7pwbld","x86_64":"0kbcl3h75nh1wd05qhqh1wxs4244bv5f60frzpsivcz68c6falpb"},"version":"4.14.38"},"4.15":{"darwin":{"aarch64":"0c4gnhfikl2gfrgsrmwzb2k82gvq76s0nmn0xlvksslyig020z0w","x86_64":"0rlxdsqhr6n396kvqrb4q6iki2ajyxdjiikxj3jhxl7vg3k42f93"},"linux":{"aarch64":"15fsj98f5xifpiplp0znkbf0ry55qyfd2bv72qcgy01afj24m9lg","x86_64":"08jjaq8b66pxds8b76x4ifbhzljbjsndmz9va1py6bvgg8akcnbr"},"version":"4.15.35"},"4.16":{"darwin":{"aarch64":"0pj28xzy685hs4pxb3z19msiy0a7d9jk9sf4k24lyd6qdhn5cymw","x86_64":"13sqb8sdxszh0dcqv0zvhk8arxhy0v00dqqrp6f76899ppibb5ys"},"linux":{"aarch64":"0z4jdqh3kmng6c155kamqifigq7jgj53920nhfcqasrv46wm2h54","x86_64":"0s7h1z0j9fxaw0s18lx7mzhmf6dp10pzpkp25vrwhb4jb788dhci"},"version":"4.16.15"},"4.17":{"darwin":{"aarch64":"1s8bg9cyllyysgmab6gip98qpqrmgn5im4vkvk70i6zx19hmb7wr","x86_64":"1gp2snnwil0nywfy41r63r0668n1mwxwh9gwlzk7kqdy7pvfwzhd"},"linux":{"aarch64":"0l6w5rq0dgpk8riqvqi1jf78hadzjdjnylm457p0fdfnfyc0k7fa","x86_64":"0hfhw00db8cjx29pg9r5ypm4543dpnc01l3g95gw8dnh1zpqnz80"},"version":"4.17.0"}}

repos/openshift-install.json

@@ -1 +1 @@
-{"4.13":{"darwin":{"aarch64":"0hly7cxylz4kc7cxjm8y9yw4n63mvp0bqgbdisw3xczm37l94mym","x86_64":"0cb9lfhfmzlbm4n0mcwpsvhd2092a4s1y5szgn0h1gnbhb6x8w2b"},"linux":{"aarch64":"12y8vagaz9v7xvbqgig40pv8nfcq14lfndklydhjkqgy15dvihdj","x86_64":"0igr7296jzwgd131qq8av9cm74hqk7i0yi7b422fgzrhbhprvly8"},"version":"4.13.51"},"4.14":{"darwin":{"aarch64":"04xiid9yw4zrlcz19zmgiimw7d6cln3myx4rmd5b3jfxxq9p9f0g","x86_64":"0yl76dx21f4dln8pvl8ll9j6savzgpg319dl97ks4mgqh9g6w9w3"},"linux":{"aarch64":"171lfwpd5sz64yii9yh9wcjhcbdkz4cwqhkwafs5335rbrwlq29f","x86_64":"1wmzgzrg9854gqs7cj4p2gcqjagbzl1bgbvr6q7k5hw48mg1kbnh"},"version":"4.14.38"},"4.15":{"darwin":{"aarch64":"08y5jx3h4pw5gbvvvgbnrr6ilc25apnlfdxy37mk8lkfyjzkpj5r","x86_64":"08ksd5vw2mrlqjyc2i62j7kqslf02mamj083jh8pqwha6wxa6vap"},"linux":{"aarch64":"0b1x77zn9k66vw295s57slgiav2zsqyp1nfjnb33w8cwscf1wbh0","x86_64":"1ryw01ni1b0ngwi0g99dk7663zc44q83fvpab2s7ssz51nm0v08z"},"version":"4.15.35"},"4.16":{"darwin":{"aarch64":"1flzjyjmcrwqi3jmda5h1sjpppf70xgav3ckvs9aw54nxlrkibvf","x86_64":"0hmbm4an157hz1si1h4kigcl8c8fw2ksyrqbl2frj8gcfjgjblv2"},"linux":{"aarch64":"0s0ri7wsq5rdh1j6dxqgf8qp199pp9mn441h9sxjnlyz296jck8w","x86_64":"1fpz76gxligbv9hdmbllvb40pryl5ld87shqy4b0y66a5d0a264m"},"version":"4.16.15"}}
+{"4.13":{"darwin":{"aarch64":"0hly7cxylz4kc7cxjm8y9yw4n63mvp0bqgbdisw3xczm37l94mym","x86_64":"0cb9lfhfmzlbm4n0mcwpsvhd2092a4s1y5szgn0h1gnbhb6x8w2b"},"linux":{"aarch64":"12y8vagaz9v7xvbqgig40pv8nfcq14lfndklydhjkqgy15dvihdj","x86_64":"0igr7296jzwgd131qq8av9cm74hqk7i0yi7b422fgzrhbhprvly8"},"version":"4.13.51"},"4.14":{"darwin":{"aarch64":"04xiid9yw4zrlcz19zmgiimw7d6cln3myx4rmd5b3jfxxq9p9f0g","x86_64":"0yl76dx21f4dln8pvl8ll9j6savzgpg319dl97ks4mgqh9g6w9w3"},"linux":{"aarch64":"171lfwpd5sz64yii9yh9wcjhcbdkz4cwqhkwafs5335rbrwlq29f","x86_64":"1wmzgzrg9854gqs7cj4p2gcqjagbzl1bgbvr6q7k5hw48mg1kbnh"},"version":"4.14.38"},"4.15":{"darwin":{"aarch64":"08y5jx3h4pw5gbvvvgbnrr6ilc25apnlfdxy37mk8lkfyjzkpj5r","x86_64":"08ksd5vw2mrlqjyc2i62j7kqslf02mamj083jh8pqwha6wxa6vap"},"linux":{"aarch64":"0b1x77zn9k66vw295s57slgiav2zsqyp1nfjnb33w8cwscf1wbh0","x86_64":"1ryw01ni1b0ngwi0g99dk7663zc44q83fvpab2s7ssz51nm0v08z"},"version":"4.15.35"},"4.16":{"darwin":{"aarch64":"1flzjyjmcrwqi3jmda5h1sjpppf70xgav3ckvs9aw54nxlrkibvf","x86_64":"0hmbm4an157hz1si1h4kigcl8c8fw2ksyrqbl2frj8gcfjgjblv2"},"linux":{"aarch64":"0s0ri7wsq5rdh1j6dxqgf8qp199pp9mn441h9sxjnlyz296jck8w","x86_64":"1fpz76gxligbv9hdmbllvb40pryl5ld87shqy4b0y66a5d0a264m"},"version":"4.16.15"},"4.17":{"darwin":{"aarch64":"0aw0sblywd6hnars1sgjrlrc2xgyc493v1fiacgm96il5js06n9q","x86_64":"0f897zza0i6lxcmz9pk7vp4vnpb9hlb2k6fzfchbyiqcrdjcsmkb"},"linux":{"aarch64":"07s9b9sr71x4m2mvcxdq3vaq1qpxawj7a6kav2974z2cmlbcrrig","x86_64":"00b4hc8whqkmv8j1l82c36v7vmz4iybfq3pak95wfwng44w449rx"},"version":"4.17.0"}}

repos/update

@@ -27,7 +27,7 @@ function update_openshift_mirror() {
     name=$1
     filename=$2
 
-    go run . -version "4.13,4.14,4.15,4.16" -arch "aarch64,x86_64" -platform "darwin,linux" ${filename} > ${name}.json
+    go run . -version "4.13,4.14,4.15,4.16,4.17" -arch "aarch64,x86_64" -platform "darwin,linux" ${filename} > ${name}.json
 }
 
 update_github_repo openshift oc master