Skip to content

Commit

Permalink
force conflicts on deploy (#689)
Browse files Browse the repository at this point in the history
  • Loading branch information
jotak committed Jun 27, 2024
1 parent d9eb369 commit 8bb4d67
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ deploy: kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/c
$(SED) -i -r 's~ebpf-agent:.+~ebpf-agent:main~' ./config/manager/manager.yaml
$(SED) -i -r 's~flowlogs-pipeline:.+~flowlogs-pipeline:main~' ./config/manager/manager.yaml
$(SED) -i -r 's~console-plugin:.+~console-plugin:main~' ./config/manager/manager.yaml
$(KUSTOMIZE) build config/openshift | sed -r "s/openshift-netobserv-operator\.svc/${NAMESPACE}.svc/" | kubectl apply --server-side -f -
$(KUSTOMIZE) build config/openshift | sed -r "s/openshift-netobserv-operator\.svc/${NAMESPACE}.svc/" | kubectl apply --server-side --force-conflicts -f -

undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
$(KUSTOMIZE) build config/openshift | kubectl --ignore-not-found=true delete -f - || true
Expand Down

0 comments on commit 8bb4d67

Please sign in to comment.