Resolve conflicts

platform9 · Sep 25, 2024 · fd6000b · fd6000b
1 parent c4ae401
commit fd6000b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/config/crd/bases/plumber.k8s.pf9.io_networkplugins.yaml b/config/crd/bases/plumber.k8s.pf9.io_networkplugins.yaml
@@ -60,10 +60,10 @@ spec:
                         type: string
                       imagePullPolicy:
                         type: string
-                      namespace:
-                        type: string
                       metricsPort:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                   multus:
                     properties:

diff --git a/hostplumber/Makefile b/hostplumber/Makefile
@@ -1,7 +1,6 @@
 SHELL=/bin/bash
 # Image URL to use all building/pushing image targets
 ifndef OVERRIDE_HOSTPLUMBER_VERSION
-<<<<<<< HEAD
 	IMG_TAG = $(shell ./get-label.bash)
 else
 	ifneq ($(strip $(OVERRIDE_HOSTPLUMBER_VERSION)),)
@@ -11,15 +10,6 @@ else
 	endif
 endif
 IMG ?= quay.io/platform9/hostplumber:$(IMG_TAG)
-=======
-IMG_TAG = $(shell ../get-label.bash)
-else
-IMG_TAG ?= $(OVERRIDE_HOSTPLUMBER_VERSION)
-endif
-
-IMG = platform9/hostplumber:$(IMG_TAG)
-
->>>>>>> 0685a84 ([PMK-6474] : Restrict TLS cipher suites for kube-rbac-proxy container (#213))
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.29