Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[operator] bump operator base image to 1.36.0 #857

Merged
merged 2 commits into from
Dec 23, 2024
Merged

[operator] bump operator base image to 1.36.0 #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79d8b02
[operator] bump operator base image to 1.36.0
jmazzitelli Dec 20, 2024
e71af74
operator changed its default metric bind port to 8443 (it was 8080). …
jmazzitelli Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ OPERATOR_QUAY_TAG ?= ${OPERATOR_QUAY_NAME}:${OPERATOR_CONTAINER_VERSION}
DORP ?= docker

# The version of the SDK this Makefile will download if needed, and the corresponding base image
OPERATOR_SDK_VERSION ?= 1.35.0
OPERATOR_SDK_VERSION ?= 1.36.0
OPERATOR_BASE_IMAGE_VERSION ?= v${OPERATOR_SDK_VERSION}
OPERATOR_BASE_IMAGE_REPO ?= quay.io/operator-framework/ansible-operator

Expand Down
1 change: 1 addition & 0 deletions manifests/kiali-ossm/manifests/kiali.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ spec:
- "--leader-election-id=kiali-operator"
- "--watches-file=./$(WATCHES_FILE)"
- "--health-probe-bind-address=:6789"
- "--metrics-bind-address=:8080"
Copy link
Contributor Author

@jmazzitelli jmazzitelli Dec 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

NOTE: it is OK changing this for the OSSM OLM metadata because this option exists in earlier versions, too. This includes the base image used downstream, as you see verified below:

4.15:

$ podman run  -it --rm registry.redhat.io/openshift4/ose-ansible-operator:v4.15 --help | grep metrics-bind-address
      --metrics-bind-address string    The address the metric endpoint binds to (default ":8080")

4.17:

$ podman run  -it --rm registry.redhat.io/openshift4/ose-ansible-operator:v4.17 --help | grep metrics-bind-address
      --metrics-bind-address string    The address the metric endpoint binds to (default ":8080")

But notice the default of these older versions is 8080, which is what we did not expect to change but did in newer versions of the upstream base image:

$ podman run -it --rm quay.io/operator-framework/ansible-operator:v1.35.0 --help | grep metrics-bind-address
      --metrics-bind-address string    The address the metric endpoint binds to (default ":8080")

$ podman run -it --rm quay.io/operator-framework/ansible-operator:v1.36.0 --help | grep metrics-bind-address
      --metrics-bind-address string    The address the metric endpoint binds to (default ":8443")

terminationMessagePolicy: FallbackToLogsOnError
readinessProbe:
httpGet:
Expand Down
1 change: 1 addition & 0 deletions manifests/kiali-upstream/2.4.0/manifests/kiali.v2.4.0.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ spec:
- "--leader-election-id=kiali-operator"
- "--watches-file=./$(WATCHES_FILE)"
- "--health-probe-bind-address=:6789"
- "--metrics-bind-address=:8080"
terminationMessagePolicy: FallbackToLogsOnError
readinessProbe:
httpGet:
Expand Down