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

Jump to bottom

operator: ensure tree is restored to a clean state #415

Merged
merged 2 commits into from
Nov 25, 2024
Merged

operator: ensure tree is restored to a clean state #415

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
2c58d7f
operator: bump operator-sdk to v1.36.0
fmuyassarov Nov 20, 2024
d379b1f
operator: remove temporary files for cleaner execution
fmuyassarov Nov 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 deployment/operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ENV VERIFY_CHECKSUM=false
RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 \
&& chmod 700 get_helm.sh && ./get_helm.sh

FROM quay.io/operator-framework/ansible-operator:v1.32.0
FROM quay.io/operator-framework/ansible-operator:v1.36.0
fmuyassarov marked this conversation as resolved.
Show resolved Hide resolved
COPY --from=build /usr/local/bin/helm /usr/local/bin/helm
COPY requirements.yml ${HOME}/requirements.yml
RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
Expand Down
4 changes: 3 additions & 1 deletion deployment/operator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ endif

# Set the Operator SDK version to use. By default, what is installed on the system is used.
# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
OPERATOR_SDK_VERSION ?= v1.32.0
OPERATOR_SDK_VERSION ?= v1.36.0

# Image URL to use all building/pushing image targets
IMAGE ?= $(IMAGE_TAG_BASE):$(IMAGE_VERSION)
Expand Down Expand Up @@ -241,6 +241,8 @@ cleanup-crds: ## Clean up temporarily copied CRDs and CRs.
rm -f $(SAMPLE_DEST_DIR)/template-config.yaml
rm -f $(SAMPLE_DEST_DIR)/topologyaware-config.yaml
rm -f $(SAMPLE_DEST_DIR)/noderesourcetopology.yaml
rm -rf $(OPERATOR_SDK)
rm config/manager/kustomization.yaml

.PHONY: kustomizations
kustomizations: config/manager/kustomization.yaml config/manifests/bases/nri-plugins-operator.clusterserviceversion.yaml
Expand Down
2 changes: 1 addition & 1 deletion deployment/operator/bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=nri-plugins-operator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.36.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=ansible.sdk.operatorframework.io/v1

Expand Down