Skip to content

network observer operator script#2156

Merged
ajssmith merged 3 commits intoskupperproject:mainfrom
ajssmith:snop
Jul 17, 2025
Merged

network observer operator script#2156
ajssmith merged 3 commits intoskupperproject:mainfrom
ajssmith:snop

Conversation

@ajssmith
Copy link
Member

No description provided.

@ajssmith ajssmith requested review from c-kruse and fgiorgetti June 10, 2025 20:58
readonly OAUTH_PROXY_IMAGE_TAG=${OAUTH_PROXY_IMAGE_TAG:-4.18.0}
readonly NGINX_IMAGE_TAG=${NGINX_IMAGE_TAG:-1.27.3-alpine}

readonly IMG=${SKUPPER_IMAGE_REGISTRY}/network-observer-operator:v${SKUPPER_IMAGE_TAG}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noticed that with the make target I ended up with network-observer-operator:vv2-dev here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will distinguish skupper images from operator semver

Copy link
Member

@fgiorgetti fgiorgetti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another observation. How does the "replaces" attribute gets populated in case
of newer versions of the operator?

set -o nounset
set -o pipefail

readonly SKUPPER_IMAGE_TAG=${1-2.0.1}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should it be: ${1:-2.0.1} ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed and added replaces to csv

Comment on lines +281 to +282
make docker-build docker-push IMG=${IMG}
make bundle-build bundle-push BUNDLE_IMG=${BUNDLE_IMG}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing I have noticed is that the produced images do not seem to be multiarch.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

includes multiarch builds now

@ajssmith ajssmith requested review from c-kruse and fgiorgetti July 3, 2025 22:04
Copy link
Member

@fgiorgetti fgiorgetti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor suggestion, but it LGTM.

readonly BUNDLE_DEFAULT_CHANNEL=${BUNDLE_DEFAULT_CHANNEL:-stable-2}

readonly REPLACED_VERSION=network-observer-operator.v${PREVIOUS_BUNDLE_VERSION}
readonly OLM_SKIP_RANGE='">2.0.0 <2.0.1"'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

">=2.0.0 <2.0.1" ?

Copy link
Contributor

@c-kruse c-kruse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very likely PEBKAC here, but I noticed several issues getting this running on openshift.

To install this I ended up running something like this:

  • make generate-network-observer-operator-bundle DEBUG=true SKUPPER_IMAGE_REGISTRY=<my-registry>
  • cd to the temp directory (left from DEBUG=true)
  • make deploy

Openshift/CRC

  • the operator deployment wouldn't get scheduled because openshift didn't like the deployment spec had a userId: 1001.
  • Deployment referenced just a "controller:latest" image?

@lynnemorrison
Copy link
Collaborator

Should cmd/network-observer/README.md be updated with instructions on how to use this script?

@ajssmith ajssmith merged commit 4e53163 into skupperproject:main Jul 17, 2025
2 checks passed
@ajssmith ajssmith deleted the snop branch July 17, 2025 16:50
@nluaces nluaces added this to the 2.1.0 milestone Jul 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants