Merge pull request #4104 from pacevedom/USHIFT-4715

USHIFT-4715: Add gateway-api-release-info RPM

Author: openshift-merge-bot[bot]

assets/optional/gateway-api/release-gateway-api-aarch64.json

@@ -0,0 +1,14 @@
+{
+  "release": {
+    "base": "3.0.0-tp.1"
+  },
+  "images": {
+    "istio-rhel9-operator-ea78213a4c5e1ef3f419df6910740f040c71ad13514aaac0e22c95e7ff4cb96b-annotation": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-rhel9-operator@sha256:ea78213a4c5e1ef3f419df6910740f040c71ad13514aaac0e22c95e7ff4cb96b",
+    "kube-rbac-proxy": "registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:0848d89e9f94be04f17beeee75807d7fd11102737e6483ee674f2cf3ae28f213",
+    "manager": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-rhel9-operator@sha256:ea78213a4c5e1ef3f419df6910740f040c71ad13514aaac0e22c95e7ff4cb96b",
+    "istio-pilot-rhel9-376f64eab0ebeb06035983a60d1e7647c5d41354f31a49cb34f4deb7b6708e3e-annotation": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-pilot-rhel9@sha256:376f64eab0ebeb06035983a60d1e7647c5d41354f31a49cb34f4deb7b6708e3e",
+    "istio-proxyv2-rhel9-cbd6bc47341ab8618609f89d063552e17232541c727429855c01deab73e4d06c-annotation": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-proxyv2-rhel9@sha256:cbd6bc47341ab8618609f89d063552e17232541c727429855c01deab73e4d06c",
+    "istio-must-gather-rhel9-e3978aecaafe2678355e21a7303f8620f53d8b774f6592f10527c15bae957224-annotation": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-must-gather-rhel9@sha256:e3978aecaafe2678355e21a7303f8620f53d8b774f6592f10527c15bae957224",
+    "istio-cni-rhel9-f16cd8a29ddcbb3de77cbfcf7e1da78e42cc0c1c502132d477a01c52689cdf23-annotation": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-cni-rhel9@sha256:f16cd8a29ddcbb3de77cbfcf7e1da78e42cc0c1c502132d477a01c52689cdf23"
+  }
+}

assets/optional/gateway-api/release-gateway-api-x86_64.json

@@ -0,0 +1,14 @@
+{
+  "release": {
+    "base": "3.0.0-tp.1"
+  },
+  "images": {
+    "istio-rhel9-operator-ea78213a4c5e1ef3f419df6910740f040c71ad13514aaac0e22c95e7ff4cb96b-annotation": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-rhel9-operator@sha256:ea78213a4c5e1ef3f419df6910740f040c71ad13514aaac0e22c95e7ff4cb96b",
+    "kube-rbac-proxy": "registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:0848d89e9f94be04f17beeee75807d7fd11102737e6483ee674f2cf3ae28f213",
+    "manager": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-rhel9-operator@sha256:ea78213a4c5e1ef3f419df6910740f040c71ad13514aaac0e22c95e7ff4cb96b",
+    "istio-pilot-rhel9-376f64eab0ebeb06035983a60d1e7647c5d41354f31a49cb34f4deb7b6708e3e-annotation": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-pilot-rhel9@sha256:376f64eab0ebeb06035983a60d1e7647c5d41354f31a49cb34f4deb7b6708e3e",
+    "istio-proxyv2-rhel9-cbd6bc47341ab8618609f89d063552e17232541c727429855c01deab73e4d06c-annotation": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-proxyv2-rhel9@sha256:cbd6bc47341ab8618609f89d063552e17232541c727429855c01deab73e4d06c",
+    "istio-must-gather-rhel9-e3978aecaafe2678355e21a7303f8620f53d8b774f6592f10527c15bae957224-annotation": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-must-gather-rhel9@sha256:e3978aecaafe2678355e21a7303f8620f53d8b774f6592f10527c15bae957224",
+    "istio-cni-rhel9-f16cd8a29ddcbb3de77cbfcf7e1da78e42cc0c1c502132d477a01c52689cdf23-annotation": "registry.redhat.io/openshift-service-mesh-tech-preview/istio-cni-rhel9@sha256:f16cd8a29ddcbb3de77cbfcf7e1da78e42cc0c1c502132d477a01c52689cdf23"
+  }
+}

packaging/rpm/microshift.spec

@@ -209,6 +209,16 @@ Requires: microshift = %{version}
 %description gateway-api
 The microshift-gateway-api package provides the required manifests for the Gateway API to be installed on MicroShift.
 
+%package gateway-api-release-info
+Summary: Release information for Gateway API for MicroShift
+BuildArch: noarch
+Requires: microshift = %{version}
+
+%description gateway-api-release-info
+The microshift-gateway-api-release-info package provides release information files for this
+release. These files contain the list of container image references used by Gateway API
+and can be used to embed those images into osbuilder blueprints.
+
 %prep
 # Dynamic detection of the available golang version also works for non-RPM golang packages
 golang_detected=$(go version | awk '{print $3}' | tr -d '[a-z]' | cut -f1-2 -d.)
@@ -466,6 +476,10 @@ cat assets/optional/gateway-api/kustomization.aarch64.yaml >> %{buildroot}/%{_pr
 cat assets/optional/gateway-api/kustomization.x86_64.yaml >> %{buildroot}/%{_prefix}/lib/microshift/manifests.d/000-microshift-gateway-api/kustomization.yaml
 %endif
 
+# gateway-api-release-info
+mkdir -p -m755 %{buildroot}%{_datadir}/microshift/release
+install -p -m644 assets/optional/gateway-api/release-gateway-api-{x86_64,aarch64}.json %{buildroot}%{_datadir}/microshift/release/
+
 %pre networking
 
 getent group hugetlbfs >/dev/null || groupadd -r hugetlbfs
@@ -624,10 +638,22 @@ fi
 %{_prefix}/lib/microshift/manifests.d/000-microshift-gateway-api/*
 %{_sysconfdir}/greenboot/check/required.d/41_microshift_running_check_gateway_api.sh
 
+%files gateway-api-release-info
+%{_datadir}/microshift/release/release-gateway-api-{x86_64,aarch64}.json
+
 
 # Use Git command to generate the log and replace the VERSION string
 # LANG=C git log --date="format:%a %b %d %Y" --pretty="tformat:* %cd %an <%ae> VERSION%n- %s%n" packaging/rpm/microshift.spec
 %changelog
+* Fri Oct 25 2024 Pablo Acevedo Montserrat <[email protected]> 4.18.0
+- USHIFT-4715: Add gateway-api-release-info rpm
+
+* Tue Oct 15 2024 Pablo Acevedo Montserrat <[email protected]> 4.18.0
+- USHIFT-4565: Add greenboot script
+
+* Tue Oct 15 2024 Pablo Acevedo Montserrat <[email protected]> 4.18.0
+- USHIFT-4565: Add microshift-gateway-api rpm
+
 * Mon Sep 16 2024 Praveen Kumar <[email protected]> 4.18.0
 - Add microshift-flannel subpackage
 

scripts/auto-rebase/ossm_assets.yaml

@@ -75,3 +75,8 @@ assets:
         ignore: "Provided by MicroShift"
       - file: kustomization.aarch64.yaml
         ignore: "Provided by MicroShift"
+      # Additional files
+      - file: release-gateway-api-aarch64.json
+        ignore: "Provided by MicroShift"
+      - file: release-gateway-api-x86_64.json
+        ignore: "Provided by MicroShift"

scripts/auto-rebase/rebase_gateway_api.sh

@@ -198,6 +198,11 @@ write_ossm_images_for_arch() {
 
     local csv_manifest="${arch_dir}/servicemeshoperator3.clusterserviceversion.yaml"
     local kustomization_arch_file="${REPOROOT}/assets/optional/gateway-api/kustomization.${GOARCH_TO_UNAME_MAP[${arch}]}.yaml"
+    local gateway_api_release_json="${REPOROOT}/assets/optional/gateway-api/release-gateway-api-${GOARCH_TO_UNAME_MAP[${arch}]}.json"
+
+    local base_release
+    base_release=$(yq ".spec.version" "${csv_manifest}")
+    jq -n "{\"release\": {\"base\": \"${base_release}\"}, \"images\": {}}" > "${gateway_api_release_json}"
 
     cat <<EOF > "${kustomization_arch_file}"
 images:
@@ -213,6 +218,7 @@ EOF
     newName: ${new_image_name}
     digest: ${new_image_digest}
 EOF
+        yq -i -o json ".images += {\"${image_name}\": \"${new_image}\"}" "${gateway_api_release_json}"
     done
 }