Merge pull request #324 from p-strusiewiczsurmacki-mobica/cert-enable-fix

Fixed enable-certs-rotation makefile target

Author: chez-shanpu

v2/Makefile

@@ -301,8 +301,8 @@ endef
 .PHONY: enable-certs-rotation
 enable-certs-rotation:
 	@sed -i "9,21 {s/^# //}" kustomization.yaml
-	@sed -i -E 's/^(- coil-.*controller_role\.yaml)/# \1/g' ../config/rbac/kustomization.yaml
-	@sed -i -E 's/^# (- coil-.*controller-certs_role\.yaml)/\1/g' ../config/rbac/kustomization.yaml
+	@sed -i -E 's/^(- coil-.*controller_role\.yaml)/# \1/g' config/rbac/kustomization.yaml
+	@sed -i -E 's/^# (- coil-.*controller-certs_role\.yaml)/\1/g' config/rbac/kustomization.yaml
 	@touch config/default/cert.pem
 	@touch config/default/ipam-cert.pem
 	@touch config/default/ipam-key.pem

v2/config/default/egress/v6/kustomization.yaml

@@ -19,4 +19,4 @@ secretGenerator:
   - ca.crt=../../cert.pem
   - tls.crt=../../egress-cert.pem
   - tls.key=../../egress-key.pem
-  type: "kubernetes.io/tls"
+  type: "kubernetes.io/tls"

v2/config/default/kustomization.yaml

@@ -29,4 +29,4 @@ secretGenerator:
   - ca.crt=./cert.pem
   - tls.crt=./egress-cert.pem
   - tls.key=./egress-key.pem
-  type: "kubernetes.io/tls"
+  type: "kubernetes.io/tls"

v2/config/rbac/egress/kustomization.yaml

@@ -5,6 +5,9 @@ resources:
 - ../leader_election_role_binding.yaml
 - ../coild_role.yaml
 # [EGRESS] Following files should be uncommented to enable Egress NAT features.
+# [CERTS] Please uncomment 'coil-egress-controller-certs_role.yaml' and 
+# comment 'coil-egress-controller_role.yaml' if automatic cert generation is being used.
 - ../coil-egress-controller_role.yaml
+# - ../coil-egress-controller-certs_role.yaml
 - ../coil-egress_role.yaml
 - ../egress_viewer_role.yaml

v2/e2e/Makefile

@@ -81,14 +81,6 @@ TEST_EGRESS ?= true
 test: setup-echotest
 	TEST_IPAM=$(TEST_IPAM) TEST_EGRESS=$(TEST_EGRESS) go test -count 1 -v . -args -ginkgo.progress -ginkgo.v
 
-.PHONY: test-ipam
-test-ipam: setup-echotest
-	TEST_IPAM=$(TEST_IPAM) TEST_EGRESS=$(TEST_EGRESS) go test -count 1 -v . -args -ginkgo.progress -ginkgo.v
-
-.PHONY: test-egress
-test-egress: setup-echotest
-	TEST_IPAM=$(TEST_IPAM) TEST_EGRESS=$(TEST_EGRESS) go test -count 1 -v . -args -ginkgo.progress -ginkgo.v
-
 .PHONY: setup-echotest
 setup-echotest:
 	CGO_ENABLED=0 go build -o echotest ./echo-server
@@ -111,8 +103,12 @@ endef
 .PHONY: enable-certs-rotation
 enable-certs-rotation:
 	@sed -i "9,21 {s/^# //}" kustomization.yaml
+	@sed -i "18,24 {s/^# //}" configs/egress/v4/kustomization.yaml
+	@sed -i "18,24 {s/^# //}" configs/egress/v6/kustomization.yaml
 	@sed -i -E 's/^(- coil-.*controller_role\.yaml)/# \1/g' ../config/rbac/kustomization.yaml
 	@sed -i -E 's/^# (- coil-.*controller-certs_role\.yaml)/\1/g' ../config/rbac/kustomization.yaml
+	@sed -i -E 's/^(- \.\.\/coil-.*controller_role\.yaml)/# \1/g' ../config/rbac/egress/kustomization.yaml
+	@sed -i -E 's/^# (- \.\.\/coil-.*controller-certs_role\.yaml)/\1/g' ../config/rbac/egress/kustomization.yaml
 	@touch ../config/default/cert.pem
 	@touch ../config/default/ipam-cert.pem
 	@touch ../config/default/ipam-key.pem

v2/e2e/configs/egress/v4/kustomization.yaml

@@ -13,3 +13,13 @@ namespace: kube-system
 # Labels to add to all resources and selectors.
 commonLabels:
   app.kubernetes.io/name: coil
+
+# [CERTS] Following patches should be uncommented if automatic cert generation is used.
+# patches:
+# - path: ../../../../config/pod/generate_certs.yaml
+#   target:
+#     group: apps
+#     version: v1
+#     kind: Deployment
+#     name: coil-egress-controller
+

v2/e2e/configs/egress/v6/kustomization.yaml

@@ -13,3 +13,13 @@ namespace: kube-system
 # Labels to add to all resources and selectors.
 commonLabels:
   app.kubernetes.io/name: coil
+
+# [CERTS] Following patches should be uncommented if automatic cert generation is used.
+# patches:
+# - path: ../../../../config/pod/generate_certs.yaml
+#   target:
+#     group: apps
+#     version: v1
+#     kind: Deployment
+#     name: coil-egress-controller
+