Merge pull request #183 from akrejcir/ssp-cert-rot-for-ocp44

Fix cert rotation for OCP 4.4 and later

Author: ksimon1

.gitignore

@@ -2,5 +2,3 @@ operator-sdk
 _out
 releases.json
 versionsrc
-
-cmd/webhook-updater/webhook-updater

Gopkg.lock

@@ -41,19 +41,3 @@ required = [
   [[prune.project]]
     name = "k8s.io/code-generator"
     non-go = false
-
-[[constraint]]
-  name = "github.com/fsnotify/fsnotify"
-  version = "1.4.7"
-
-[[constraint]]
-  name = "github.com/onsi/ginkgo"
-  version = "1.12.0"
-
-[[constraint]]
-  name = "github.com/onsi/gomega"
-  version = "1.10.0"
-
-[[constraint]]
-  name = "github.com/spf13/pflag"
-  version = "1.0.5"

Gopkg.toml

@@ -8,7 +8,7 @@ REGISTRY_IMAGE ?= kubevirt-ssp-operator-registry
 
 container-build: csv-generator container-build-operator container-build-registry
 
-container-build-operator: webhook-updater
+container-build-operator:
 	docker build -f build/Dockerfile -t $(IMAGE_REGISTRY)/$(OPERATOR_IMAGE):$(IMAGE_TAG) .
 
 container-build-registry:
@@ -25,9 +25,6 @@ container-push-registry:
 container-release:
 	./hack/docker-push.sh $(IMAGE_REGISTRY)/$(OPERATOR_IMAGE):$(IMAGE_TAG) $(IMAGE_REGISTRY)/$(REGISTRY_IMAGE):$(IMAGE_TAG)
 
-webhook-updater:
-	./hack/build-webhook-updater.sh
-
 csv-generator: operator-sdk
 	./build/make-csv-generator.sh
 
@@ -53,7 +50,4 @@ release: manifests container-build container-release
 functests: manifests
 	cd functests && ./test-runner.sh
 
-unittests:
-	go test -v ./...
-
-.PHONY: functests unittests release webhook-updater manifests manifests-prepare manifests-cleanup container-push container-build container-release
+.PHONY: functests release manifests manifests-prepare manifests-cleanup container-push container-build container-release

Makefile

@@ -18,5 +18,3 @@ COPY build/csv-generator.sh /usr/bin/csv-generator
 COPY build/preprocess_template.py ${HOME}/
 COPY patch.yaml ${HOME}/
 RUN python3 ${HOME}/preprocess_template.py ${HOME}/patch.yaml ${HOME}/roles/KubevirtCommonTemplatesBundle/files/
-
-COPY cmd/webhook-updater/webhook-updater /usr/bin/webhook-updater

build/Dockerfile

@@ -26,5 +26,5 @@ metadata:
   name: kubevirt-template-validator
   namespace: kubevirt
 spec:
-  version: v0.6.2
+  version: v0.6.6
   templateValidatorReplicas: 2

cluster/latest/kubevirt-ssp-operator-cr.yaml

@@ -195,8 +195,3 @@ spec:
               value: ""
             - name: OPERATOR_NAME
               value: "kubevirt-ssp-operator"
-        - name: webhook-updater
-          image: quay.io/fromani/kubevirt-ssp-operator-container:latest
-          command: ["webhook-updater"]
-          args: ["--port", "8081"]
-          imagePullPolicy: Always

cluster/latest/kubevirt-ssp-operator.yaml

@@ -4,5 +4,5 @@ metadata:
   name: kubevirt-template-validator
   namespace: kubevirt
 spec:
-  version: v0.6.2
+  version: v0.6.6
   templateValidatorReplicas: 2

cmd/webhook-updater/main.go

@@ -50,8 +50,3 @@ spec:
               value: ""
             - name: OPERATOR_NAME
               value: "kubevirt-ssp-operator"
-        - name: webhook-updater
-          image: REPLACE_IMAGE
-          command: ["webhook-updater"]
-          args: ["--port", "8081"]
-          imagePullPolicy: Always

deploy/crds/kubevirt_v1_templatevalidator_cr.yaml

@@ -15,7 +15,6 @@ docker login -u $(oc whoami) -p $(oc whoami -t) ${REGISTRY}
 
 docker images
 
-make -C ${BASEPATH}/.. webhook-updater
 docker build -f ${BASEPATH}/../build/Dockerfile -t ${REGISTRY}/kubevirt/kubevirt-ssp-operator:devel ${BASEPATH}/..
 docker push ${REGISTRY}/kubevirt/kubevirt-ssp-operator:devel || :