Skip to content

Commit

Permalink
testing 02
Browse files Browse the repository at this point in the history
Signed-off-by: Eguzki Astiz Lezaun <[email protected]>
  • Loading branch information
eguzki committed Oct 21, 2024
1 parent d6b16fa commit 88ee78f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
17 changes: 12 additions & 5 deletions .github/workflows/build-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,18 @@ jobs:
- name: Read operator image reference from the manifest bundle
id: operator-image
run: |
make bundle-operator-image-url
echo "url=$(make bundle-operator-image-url)"
echo "url=$(make bundle-operator-image-url)" >> $GITHUB_OUTPUT
echo "tag=$(make bundle-operator-image-tag)" >> $GITHUB_OUTPUT
{
"url=$(make bundle-operator-image-url)"
"tag=$(make bundle-operator-image-tag)"
} >> $GITHUB_OUTPUT
{
echo "### Workflow variables"
echo "| Variable | Value |"
echo "| ---------- | ----------- |"
echo "| url | $url |"
echo "| tag | $tag |"
} >> $GITHUB_STEP_SUMMARY
- name: Add latest tag
if: ${{ github.ref_name == env.MAIN_BRANCH_NAME }}
id: add-latest-tag
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -443,10 +443,10 @@ bundle: manifests manifests-gen-base-csv kustomize operator-sdk ## Generate bund
$(MAKE) bundle-ignore-createdAt

bundle-operator-image-url: $(YQ) ## Read operator image reference URL from the manifest bundle.
@$(YQ) -0 '.metadata.annotations.containerImage' bundle/manifests/dns-operator.clusterserviceversion.yaml
@$(YQ) '.metadata.annotations.containerImage' bundle/manifests/dns-operator.clusterserviceversion.yaml

bundle-operator-image-tag: $(YQ) ## Read operator image reference TAG from the manifest bundle.
@$(YQ) -0 '.metadata.annotations.containerImage | split(":") | .[1]' bundle/manifests/dns-operator.clusterserviceversion.yaml
@$(YQ) '.metadata.annotations.containerImage | split(":") | .[1]' bundle/manifests/dns-operator.clusterserviceversion.yaml

# Since operator-sdk 1.26.0, `make bundle` changes the `createdAt` field from the bundle
# even if it is patched:
Expand Down

0 comments on commit 88ee78f

Please sign in to comment.