update deployment suff

.github/workflows/policy-controller-image.yaml

@@ -54,7 +54,7 @@ jobs:
         with:
           push: true
           tags: ${{ env.IMG_TAGS }}
-          target: controller
+          target: policy-controller
 
       - name: Print Image URL
         run: |

Dockerfile

@@ -21,7 +21,10 @@ COPY pkg/ pkg/
 # the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
 # by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
 FROM builder as controller_builder
-RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o controller cmd/controller/main.go
+RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o controller cmd/gateway_controller/main.go
+
+FROM builder as policy_builder
+RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o policy_controller cmd/policy_controller/main.go
 
 FROM builder as addon_builder
 RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o add-on-manager cmd/ocm/main.go
@@ -42,4 +45,14 @@ WORKDIR /
 COPY --from=addon_builder /workspace/add-on-manager .
 USER 65532:65532
 
-ENTRYPOINT ["/add-on-manager"]
+ENTRYPOINT ["/add-on-manager"]
+
+
+# Use distroless as minimal base image to package the manager binary
+# Refer to https://github.com/GoogleContainerTools/distroless for more details
+FROM gcr.io/distroless/static:nonroot as policy-controller
+WORKDIR /
+COPY --from=policy_builder /workspace/policy_controller .
+USER 65532:65532
+
+ENTRYPOINT ["/policy_controller"]

cmd/policy_controller/main.go

@@ -21,6 +21,7 @@ import (
 	"os"
 
 	certmanv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
+	clusterv1 "open-cluster-management.io/api/cluster/v1"
 
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -50,6 +51,8 @@ func init() {
 	utilruntime.Must(gatewayapi.AddToScheme(scheme.Scheme))
 	utilruntime.Must(v1alpha1.AddToScheme(scheme.Scheme))
 	utilruntime.Must(certmanv1.AddToScheme(scheme.Scheme))
+	//this is need for now but will be removed soon
+	utilruntime.Must(clusterv1.AddToScheme(scheme.Scheme))
 }
 
 func main() {

config/default/kustomization.yaml

@@ -31,6 +31,7 @@ namePrefix: mgc-
 resources:
 - ../crd
 - ../rbac
+- namespace.yaml
 - ../manager
 - ../add-on-manager
 - ../policy-controller

config/manager/kustomization.yaml

@@ -1,5 +1,4 @@
 resources:
-- namespace.yaml
 - manager.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

config/policy-controller/manager.yaml

@@ -27,12 +27,12 @@ spec:
         runAsNonRoot: true
       containers:
       - command:
-        - /policy-controller
+        - /policy_controller
         args:
         - --leader-elect
         image: policy-controller:latest
         imagePullPolicy: Always
-        name: manager
+        name: policy-controller
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

hack/.deployUtils

@@ -50,7 +50,7 @@ deployOLM(){
   kubectl config use-context kind-${clusterName}
   kubectl config --kubeconfig=${TMP_DIR}/kubeconfig use-context kind-${clusterName}
   echo "Installing OLM in ${clusterName}"
-  ${OPERATOR_SDK_BIN} olm install --timeout 6m0s
+  ${OPERATOR_SDK_BIN} olm install --timeout 10m0s
 }
 
 
@@ -110,7 +110,7 @@ deployMetalLB () {
   echo "Deploying MetalLB to ${clusterName}"
   ${KUSTOMIZE_BIN} build ${METALLB_KUSTOMIZATION_DIR} | kubectl apply -f -
   echo "Waiting for deployments to be ready ..."
-  kubectl -n metallb-system wait --for=condition=ready pod --selector=app=metallb --timeout=300s
+  kubectl -n metallb-system wait --for=condition=ready pod --selector=app=metallb --timeout=600s
   configureMetalLB ${clusterName} ${metalLBSubnet}
 }
 

hack/make/policy_controller.make

@@ -1,6 +1,6 @@
-##@ Controller
+##@ PolicyController
 
-CONTROLLER_IMG ?= policy-controller:$(TAG)
+POLICY_CONTROLLER_IMG ?= policy-controller:$(TAG)
 LOG_LEVEL ?= 3
 
 .PHONY: build-policy-controller
@@ -16,20 +16,20 @@ run-policy-controller: manifests generate fmt vet  install
 
 .PHONY: docker-build-policy-controller
 docker-build-policy-controller: ## Build docker image with the controller.
-	docker build --target controller -t ${CONTROLLER_IMG} .
+	docker build --target policy-controller -t ${POLICY_CONTROLLER_IMG} .
 	docker image prune -f --filter label=stage=mgc-builder
 
 .PHONY: kind-load-policy-controller
 kind-load-policy-controller: docker-build-policy-controller
-	kind load docker-image ${CONTROLLER_IMG} --name mgc-control-plane  --nodes mgc-control-plane-control-plane
+	kind load docker-image ${POLICY_CONTROLLER_IMG} --name mgc-control-plane  --nodes mgc-control-plane-control-plane
 
 .PHONY: docker-push-policy-controller
 docker-push-policy-controller: ## Push docker image with the controller.
-	docker push ${CONTROLLER_IMG}
+	docker push ${POLICY_CONTROLLER_IMG}
 
 .PHONY: deploy-policy-controller
 deploy-policy-controller: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/policy-controller && $(KUSTOMIZE) edit set image controller=${CONTROLLER_IMG}
+	cd config/policy-controller && $(KUSTOMIZE) edit set image controller=${POLICY_CONTROLLER_IMG}
 	$(KUSTOMIZE) --load-restrictor LoadRestrictionsNone build config/deploy/local | kubectl apply -f -
 	@if [ $(METRICS) = "true" ]; then\
 		$(KUSTOMIZE) build config/prometheus | kubectl apply -f -;\