From 227efb05b7cb48797e3669004619448c07a68a5f Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Arango Gutierrez Date: Tue, 17 May 2022 12:51:44 -0400 Subject: [PATCH] Swap default image to Minimal Point master manifest to staging registry Document minimal image tag as default Use master-minimal on CSV example Signed-off-by: Carlos Eduardo Arango Gutierrez --- Makefile | 4 ++-- .../manifests/bases/nfd-operator.clusterserviceversion.yaml | 6 +++--- docs/_config.yml | 2 +- docs/get-started/quick-start.md | 4 ++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 690f1fd3..1a248379 100644 --- a/Makefile +++ b/Makefile @@ -120,7 +120,7 @@ clean-manifests = (cd config/manager && $(KUSTOMIZE) edit set image controller=k # Deploy controller in the configured Kubernetes cluster in ~/.kube/config deploy: kustomize cd $(PROJECT_DIR)/config/manager && \ - $(KUSTOMIZE) edit set image controller=${IMAGE_TAG} + $(KUSTOMIZE) edit set image controller=${IMAGE_TAG}-minimal cd $(PROJECT_DIR)/config/default && \ $(KUSTOMIZE) edit set image kube-rbac-proxy=${IMAGE_TAG_RBAC_PROXY} $(KUSTOMIZE) build config/default | kubectl apply -f - @@ -214,7 +214,7 @@ kustomize: .PHONY: bundle bundle: manifests kustomize operator-sdk generate kustomize manifests -q - cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE_TAG) + cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE_TAG)-minimal $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) operator-sdk bundle validate ./bundle diff --git a/config/manifests/bases/nfd-operator.clusterserviceversion.yaml b/config/manifests/bases/nfd-operator.clusterserviceversion.yaml index 97c91e8a..eeb8d0a2 100644 --- a/config/manifests/bases/nfd-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/nfd-operator.clusterserviceversion.yaml @@ -13,7 +13,7 @@ metadata: }, "spec": { "operand": { - "image": "gcr.io/k8s-staging-nfd/node-feature-discovery:master", + "image": "gcr.io/k8s-staging-nfd/node-feature-discovery:master-minimal", "imagePullPolicy": "Always", "servicePort": 12000 }, @@ -463,8 +463,8 @@ spec: - name: OPERATOR_NAME value: cluster-nfd-operator - name: NODE_FEATURE_DISCOVERY_IMAGE - value: k8s.gcr.io/nfd/node-feature-discovery:master - image: k8s.gcr.io/nfd/node-feature-discovery-operator:master + value: gcr.io/k8s-staging-nfd/node-feature-discovery:master-minimal + image: gcr.io/k8s-staging-nfd/node-feature-discovery-operator:master-minimal imagePullPolicy: Always livenessProbe: httpGet: diff --git a/docs/_config.yml b/docs/_config.yml index 18b3c7e9..aad1428c 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -51,6 +51,6 @@ display_version_list: true release: master # Container image which to point to in the documentation -container_image: gcr.io/k8s-staging-nfd/node-feature-discovery-operator:master +container_image: gcr.io/k8s-staging-nfd/node-feature-discovery-operator:master-minimal # Operand Node Feature Discovery documentation version operand_version: master diff --git a/docs/get-started/quick-start.md b/docs/get-started/quick-start.md index 191d0721..00b4ef40 100644 --- a/docs/get-started/quick-start.md +++ b/docs/get-started/quick-start.md @@ -20,6 +20,10 @@ git clone -b {{ site.release }} https://github.com/kubernetes-sigs/node-feature- Deploy the operator +> By default it will deploy using the minimal tag image, is +> desired you can simply modify the IMAGE_TAG env var to point to the image +> tag to use. + ```bash IMAGE_TAG={{ site.container_image }} make deploy