restore config directory after building bundle

Signed-off-by: Kevin <[email protected]>

Author: KPostOffice

Diff for: CONTRIBUTING.md

@@ -31,20 +31,20 @@ If changes are made to any Go code (like in the `controllers` dir for example),
  - This will check and build/compile the modified code
 
 For building and pushing a new version of the operator image:
- - `make image-build -e IMG_TAG_BASE=<image-repo/image-name> VERSION=<semver>`
- - `make image-push -e IMG_TAG_BASE=<image-repo/image-name> VERSION=<semver>`
+ - `make image-build -e IMAGE_TAG_BASE=<image-repo/image-name> VERSION=<semver>`
+ - `make image-push -e IMAGE_TAG_BASE=<image-repo/image-name> VERSION=<semver>`
 
 For deploying onto a cluster:
  - First, either set `KUBECONFIG` or ensure you are logged into a cluster in your environment
  - `make install`
  - `make deploy -e IMG=<image-repo/image-name>`
 
 For building and pushing a new version of the bundled operator image:
- - `make bundle-build -e IMG_TAG_BASE=<image-repo/image-name> VERSION=<new semver> PREVIOUS_VERSION=<semver to replace>`
- - `make bundle-push -e IMG_TAG_BASE=<image-repo/image-name> VERSION=<new semver> PREVIOUS_VERSION=<semver to replace>`
+ - `make bundle-build -e IMAGE_TAG_BASE=<image-repo/image-name> VERSION=<new semver> PREVIOUS_VERSION=<semver to replace>`
+ - `make bundle-push -e IMAGE_TAG_BASE=<image-repo/image-name> VERSION=<new semver> PREVIOUS_VERSION=<semver to replace>`
 
 To create a new openshift-community-operator-release:
- - `make openshift-community-operator-release -e IMG_TAG_BASE=<image-repo/image-name> VERSION=<new semver> PREVIOUS_VERSION=<semver to replace>`
+ - `make openshift-community-operator-release -e IMAGE_TAG_BASE=<image-repo/image-name> VERSION=<new semver> PREVIOUS_VERSION=<semver to replace>`
 
 ## Testing
 The CodeFlare Operator currently has unit tests and pre-commit checks

Diff for: Makefile

@@ -170,6 +170,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
+	git restore config/*
 
 .PHONY: undeploy
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
@@ -241,6 +242,7 @@ bundle: defaults manifests kustomize install-operator-sdk ## Generate bundle man
 	cd config/manifests && $(KUSTOMIZE) edit add patch --patch '[{"op":"add", "path":"/spec/replaces", "value": "codeflare-operator.v$(PREVIOUS_VERSION)" }]' --kind ClusterServiceVersion
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
 	$(MAKE) validate-bundle
+	git restore config/*
 
 .PHONY: bundle-build
 bundle-build: bundle ## Build the bundle image.