diff --git a/Makefile b/Makefile index 688b974a1..6d484a4fc 100644 --- a/Makefile +++ b/Makefile @@ -31,9 +31,6 @@ SRC = $(shell find . -type f -name '*.go' -not -path "./vendor/*") # Current Operator version VERSION ?= 4.7.0 -# Default bundle image tag -BUNDLE_IMG ?= controller-bundle:$(VERSION) -# Options for 'bundle-build' ifneq ($(origin CHANNELS), undefined) BUNDLE_CHANNELS := --channels=$(CHANNELS) endif @@ -172,19 +169,6 @@ skopeo: fakechroot: if ! which fakechroot; then if [ -f /etc/redhat-release ]; then dnf -y install fakechroot; elif [ -f /etc/lsb-release ]; then sudo apt-get -y update; sudo apt-get -y install fakechroot; fi; fi -# Generate bundle manifests and metadata, then validate generated files. -.PHONY: bundle -bundle: manifests - operator-sdk generate kustomize manifests --interactive=false -q - cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) - $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) - operator-sdk bundle validate ./bundle - -# Build the bundle image. -.PHONY: bundle-build -bundle-build: - docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) . - deploy-setup: export ENABLE_ADMISSION_CONTROLLER?=true deploy-setup: skopeo install hack/deploy-setup.sh $(NAMESPACE) diff --git a/bundle.Dockerfile b/bundle.Dockerfile deleted file mode 100644 index 09e18420f..000000000 --- a/bundle.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM scratch - -# Core bundle labels. -LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 -LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ -LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ -LABEL operators.operatorframework.io.bundle.package.v1=sriov-network-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.27.0 -LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 -LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 - -# Copy files to locations specified by labels. -COPY bundle/manifests /manifests/ -COPY bundle/metadata /metadata/ diff --git a/bundle/manifests/sriov-network-operator.clusterserviceversion.yaml b/bundle/manifests/sriov-network-operator.clusterserviceversion.yaml deleted file mode 100644 index 16da29563..000000000 --- a/bundle/manifests/sriov-network-operator.clusterserviceversion.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: '[]' - capabilities: Basic Install - createdAt: "2023-09-07T12:07:04Z" - operators.operatorframework.io/builder: operator-sdk-v1.27.0 - operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: sriov-network-operator.v4.7.0 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: {} - description: Sriov Network Operator description. TODO. - displayName: Sriov Network Operator - icon: - - base64data: "" - mediatype: "" - install: - spec: - deployments: [] - strategy: deployment - installModes: - - supported: false - type: OwnNamespace - - supported: false - type: SingleNamespace - - supported: false - type: MultiNamespace - - supported: true - type: AllNamespaces - keywords: - - sriov-network-operator - links: - - name: Sriov Network Operator - url: https://sriov-network-operator.domain - maintainers: - - email: your@email.com - name: Maintainer Name - maturity: alpha - provider: - name: Provider Name - url: https://your.domain - version: 4.7.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml deleted file mode 100644 index 3ac82c3ba..000000000 --- a/bundle/metadata/annotations.yaml +++ /dev/null @@ -1,10 +0,0 @@ -annotations: - # Core bundle annotations. - operators.operatorframework.io.bundle.mediatype.v1: registry+v1 - operators.operatorframework.io.bundle.manifests.v1: manifests/ - operators.operatorframework.io.bundle.metadata.v1: metadata/ - operators.operatorframework.io.bundle.package.v1: sriov-network-operator - operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.27.0 - operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 - operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3