From b914a626c3493b18253fe903aa18688c540cc68b Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Sat, 12 Oct 2024 04:28:43 +1100
Subject: [PATCH] [8.15] deps: Bump ironbank version to 9.4 (#195864) (#195956)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Backport

This will backport the following commits from `main` to `8.15`:
- [deps: Bump ironbank version to 9.4
(#195864)](https://github.com/elastic/kibana/pull/195864)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"github-actions[bot]","email":"41898282+github-actions[bot]@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-10-11T15:44:05Z","message":"deps:
Bump ironbank version to 9.4
(#195864)\n\n<Actions>\r\n<action\r\nid=\"ad27da7f660d61c82c61599e0e6945827ced1590f4bf36a5f74db07e99c04215\">\r\n
<h3>deps: Bump ironbank
version</h3>\r\n<details\r\nid=\"99cabf4d5a2b44b2d93b4c18590b8ccd5df3002e8d9d506c038c9011e8e93734\">\r\n
<summary>deps(ironbank): Bump ubi version to 9.4</summary>\r\n<p>change
detected:&#xA;&#x9;* key &#34;$.args.BASE_TAG&#34; updated\r\nfrom
&#34;&#39;9.4&#39;&#34; to &#34;\\&#34;9.4\\&#34;&#34;, in
file\r\n&#34;src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml&#34;</p>\r\n
</details>\r\n<a\r\nhref=\"https://github.com/elastic/kibana/actions/runs/11287176047\">GitHub\r\nAction
workflow link</a>\r\n
</action>\r\n</Actions>\r\n\r\n---\r\n\r\n<table>\r\n <tr>\r\n <td
width=\"77\">\r\n<img
src=\"https://www.updatecli.io/images/updatecli.png\"
alt=\"Updatecli\r\nlogo\" width=\"50\" height=\"50\">\r\n </td>\r\n
<td>\r\n <p>\r\nCreated automatically by
<a\r\nhref=\"https://www.updatecli.io/\">Updatecli</a>\r\n </p>\r\n
<details><summary>Options:</summary>\r\n <br />\r\n<p>Most of Updatecli
configuration is done via
<a\r\nhref=\"https://www.updatecli.io/docs/prologue/quick-start/\">its\r\nmanifest(s)</a>.</p>\r\n
<ul>\r\n<li>If you close this pull request, Updatecli will automatically
reopen\r\nit, the next time it runs.</li>\r\n<li>If you close this pull
request and delete the base branch, Updatecli\r\nwill automatically
recreate it, erasing all previous commits made.</li>\r\n </ul>\r\n
<p>\r\nFeel free to report any issues at
<a\r\nhref=\"https://github.com/updatecli/updatecli/issues\">github.com/updatecli/updatecli</a>.<br\r\n/>\r\nIf
you find this tool useful, do not hesitate to star
<a\r\nhref=\"https://github.com/updatecli/updatecli/stargazers\">our
GitHub\r\nrepository</a> as a sign of appreciation, and/or to tell us
directly on\r\nour
<a\r\nhref=\"https://matrix.to/#/#Updatecli_community:gitter.im\">chat</a>!\r\n
</p>\r\n </details>\r\n </td>\r\n
</tr>\r\n</table>\r\n\r\nCo-authored-by: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>\r\nCo-authored-by:
Victor Martinez
<victormartinezrubio@gmail.com>","sha":"4ab5916429f86a145a4842b6434193eafd00310b","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","dependencies","💝community","v9.0.0","backport:prev-major"],"title":"deps:
Bump ironbank version to
9.4","number":195864,"url":"https://github.com/elastic/kibana/pull/195864","mergeCommit":{"message":"deps:
Bump ironbank version to 9.4
(#195864)\n\n<Actions>\r\n<action\r\nid=\"ad27da7f660d61c82c61599e0e6945827ced1590f4bf36a5f74db07e99c04215\">\r\n
<h3>deps: Bump ironbank
version</h3>\r\n<details\r\nid=\"99cabf4d5a2b44b2d93b4c18590b8ccd5df3002e8d9d506c038c9011e8e93734\">\r\n
<summary>deps(ironbank): Bump ubi version to 9.4</summary>\r\n<p>change
detected:&#xA;&#x9;* key &#34;$.args.BASE_TAG&#34; updated\r\nfrom
&#34;&#39;9.4&#39;&#34; to &#34;\\&#34;9.4\\&#34;&#34;, in
file\r\n&#34;src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml&#34;</p>\r\n
</details>\r\n<a\r\nhref=\"https://github.com/elastic/kibana/actions/runs/11287176047\">GitHub\r\nAction
workflow link</a>\r\n
</action>\r\n</Actions>\r\n\r\n---\r\n\r\n<table>\r\n <tr>\r\n <td
width=\"77\">\r\n<img
src=\"https://www.updatecli.io/images/updatecli.png\"
alt=\"Updatecli\r\nlogo\" width=\"50\" height=\"50\">\r\n </td>\r\n
<td>\r\n <p>\r\nCreated automatically by
<a\r\nhref=\"https://www.updatecli.io/\">Updatecli</a>\r\n </p>\r\n
<details><summary>Options:</summary>\r\n <br />\r\n<p>Most of Updatecli
configuration is done via
<a\r\nhref=\"https://www.updatecli.io/docs/prologue/quick-start/\">its\r\nmanifest(s)</a>.</p>\r\n
<ul>\r\n<li>If you close this pull request, Updatecli will automatically
reopen\r\nit, the next time it runs.</li>\r\n<li>If you close this pull
request and delete the base branch, Updatecli\r\nwill automatically
recreate it, erasing all previous commits made.</li>\r\n </ul>\r\n
<p>\r\nFeel free to report any issues at
<a\r\nhref=\"https://github.com/updatecli/updatecli/issues\">github.com/updatecli/updatecli</a>.<br\r\n/>\r\nIf
you find this tool useful, do not hesitate to star
<a\r\nhref=\"https://github.com/updatecli/updatecli/stargazers\">our
GitHub\r\nrepository</a> as a sign of appreciation, and/or to tell us
directly on\r\nour
<a\r\nhref=\"https://matrix.to/#/#Updatecli_community:gitter.im\">chat</a>!\r\n
</p>\r\n </details>\r\n </td>\r\n
</tr>\r\n</table>\r\n\r\nCo-authored-by: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>\r\nCo-authored-by:
Victor Martinez
<victormartinezrubio@gmail.com>","sha":"4ab5916429f86a145a4842b6434193eafd00310b"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/195864","number":195864,"mergeCommit":{"message":"deps:
Bump ironbank version to 9.4
(#195864)\n\n<Actions>\r\n<action\r\nid=\"ad27da7f660d61c82c61599e0e6945827ced1590f4bf36a5f74db07e99c04215\">\r\n
<h3>deps: Bump ironbank
version</h3>\r\n<details\r\nid=\"99cabf4d5a2b44b2d93b4c18590b8ccd5df3002e8d9d506c038c9011e8e93734\">\r\n
<summary>deps(ironbank): Bump ubi version to 9.4</summary>\r\n<p>change
detected:&#xA;&#x9;* key &#34;$.args.BASE_TAG&#34; updated\r\nfrom
&#34;&#39;9.4&#39;&#34; to &#34;\\&#34;9.4\\&#34;&#34;, in
file\r\n&#34;src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml&#34;</p>\r\n
</details>\r\n<a\r\nhref=\"https://github.com/elastic/kibana/actions/runs/11287176047\">GitHub\r\nAction
workflow link</a>\r\n
</action>\r\n</Actions>\r\n\r\n---\r\n\r\n<table>\r\n <tr>\r\n <td
width=\"77\">\r\n<img
src=\"https://www.updatecli.io/images/updatecli.png\"
alt=\"Updatecli\r\nlogo\" width=\"50\" height=\"50\">\r\n </td>\r\n
<td>\r\n <p>\r\nCreated automatically by
<a\r\nhref=\"https://www.updatecli.io/\">Updatecli</a>\r\n </p>\r\n
<details><summary>Options:</summary>\r\n <br />\r\n<p>Most of Updatecli
configuration is done via
<a\r\nhref=\"https://www.updatecli.io/docs/prologue/quick-start/\">its\r\nmanifest(s)</a>.</p>\r\n
<ul>\r\n<li>If you close this pull request, Updatecli will automatically
reopen\r\nit, the next time it runs.</li>\r\n<li>If you close this pull
request and delete the base branch, Updatecli\r\nwill automatically
recreate it, erasing all previous commits made.</li>\r\n </ul>\r\n
<p>\r\nFeel free to report any issues at
<a\r\nhref=\"https://github.com/updatecli/updatecli/issues\">github.com/updatecli/updatecli</a>.<br\r\n/>\r\nIf
you find this tool useful, do not hesitate to star
<a\r\nhref=\"https://github.com/updatecli/updatecli/stargazers\">our
GitHub\r\nrepository</a> as a sign of appreciation, and/or to tell us
directly on\r\nour
<a\r\nhref=\"https://matrix.to/#/#Updatecli_community:gitter.im\">chat</a>!\r\n
</p>\r\n </details>\r\n </td>\r\n
</tr>\r\n</table>\r\n\r\nCo-authored-by: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>\r\nCo-authored-by:
Victor Martinez
<victormartinezrubio@gmail.com>","sha":"4ab5916429f86a145a4842b6434193eafd00310b"}}]}]
BACKPORT-->

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../templates/ironbank/hardening_manifest.yaml            | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
index 4dc8ff9868dc1..287739cc03fea 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
@@ -1,21 +1,17 @@
 ---
 apiVersion: v1
-
 # The repository name in registry1, excluding /ironbank/
 name: 'elastic/kibana/kibana'
-
 # List of tags to push for the repository in registry1
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
   - '{{version}}'
   - 'latest'
-
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: 'redhat/ubi/ubi9'
-  BASE_TAG: '9.4'
-
+  BASE_TAG: "9.4"
 # Docker image labels
 labels:
   org.opencontainers.image.title: 'kibana'
@@ -27,7 +23,6 @@ labels:
   # mil.dso.ironbank.image.keywords: ""
   # mil.dso.ironbank.image.type: "commercial"
   mil.dso.ironbank.product.name: 'Kibana'
-
 # List of resources to make available to the offline build context
 resources:
   - filename: kibana-{{version}}-linux-x86_64.tar.gz
@@ -45,7 +40,6 @@ resources:
     validation:
       type: sha512
       value: 0ce56bde1853fed3e53282505bac65707385275a27816c29712ab04c187aa249797c82c58759b2b36c210d4e2683eda92359d739a8045cb8385c2c34d37cc9e1
-
 # List of project maintainers
 maintainers:
   - email: 'jon@elastic.co'