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

Swap default image to Minimal #157

Merged
merged 1 commit into from
May 19, 2022
Merged

Swap default image to Minimal #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions config/manifests/bases/nfd-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions docs/get-started/quick-start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down