Drop operator-less installation and adjust generated manifests

Synchronize the manifest templates with the operator codebase and drop all references to the operator-less installation method. Signed-off-by: Roman Mohr <[email protected]>
alicefr · Apr 8, 2020 · 19f14a6 · 19f14a6
1 parent 5995d21
commit 19f14a6
Show file tree

Hide file tree

Showing 20 changed files with 75 additions and 1,174 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,7 +31,7 @@ vendor/**/*_test.go
 **/polarion.xml
 tools/manifest-templator/manifest-templator
 tools/vms-generator/vms-generator
-.coverprofile
+.coverprofile*
 coverage.html
 manifests/**/*.tmp
 /bazel-*

diff --git a/.travis.yml b/.travis.yml
@@ -66,8 +66,6 @@ deploy:
   file_glob: true
   file:
   - _out/cmd/virtctl/virtctl-v*
-  - _out/manifests/release/kubevirt.yaml
-  - _out/templates/manifests/release/kubevirt.yaml.j2
   - _out/manifests/release/demo-content.yaml
   - _out/manifests/release/kubevirt-operator.yaml
   - _out/manifests/release/kubevirt-cr.yaml

diff --git a/hack/generate.sh b/hack/generate.sh
@@ -43,17 +43,9 @@ ${KUBEVIRT_DIR}/tools/openapispec/openapispec --dump-api-spec-path ${KUBEVIRT_DI
 rm -f ${KUBEVIRT_DIR}/manifests/generated/*
 rm -f ${KUBEVIRT_DIR}/examples/*
 ${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=priorityclass >${KUBEVIRT_DIR}/manifests/generated/kubevirt-priority-class.yaml
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=vmi >${KUBEVIRT_DIR}/manifests/generated/vmi-resource.yaml
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=vmirs >${KUBEVIRT_DIR}/manifests/generated/vmirs-resource.yaml
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=vmipreset >${KUBEVIRT_DIR}/manifests/generated/vmipreset-resource.yaml
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=vm >${KUBEVIRT_DIR}/manifests/generated/vm-resource.yaml
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=vmim >${KUBEVIRT_DIR}/manifests/generated/vmim-resource.yaml
 ${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=kv >${KUBEVIRT_DIR}/manifests/generated/kv-resource.yaml
 ${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=kv-cr --namespace={{.Namespace}} --pullPolicy={{.ImagePullPolicy}} >${KUBEVIRT_DIR}/manifests/generated/kubevirt-cr.yaml.in
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=kubevirt-rbac --namespace={{.Namespace}} >${KUBEVIRT_DIR}/manifests/generated/rbac-kubevirt.authorization.k8s.yaml.in
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=cluster-rbac --namespace={{.Namespace}} >${KUBEVIRT_DIR}/manifests/generated/rbac-cluster.authorization.k8s.yaml.in
 ${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=operator-rbac --namespace={{.Namespace}} >${KUBEVIRT_DIR}/manifests/generated/rbac-operator.authorization.k8s.yaml.in
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=prometheus --namespace={{.Namespace}} >${KUBEVIRT_DIR}/manifests/generated/prometheus.yaml.in
 
 # used for Image fields in manifests
 function getVersion() {
@@ -84,10 +76,6 @@ virtcontroller_rawsha=$(getRawShasum ".VirtControllerSha")
 virthandler_rawsha=$(getRawShasum ".VirtHandlerSha")
 virtlauncher_rawsha=$(getRawShasum ".VirtLauncherSha")
 
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=virt-api --namespace={{.Namespace}} --repository={{.DockerPrefix}} --version="$virtapi_version" --pullPolicy={{.ImagePullPolicy}} --verbosity={{.Verbosity}} >${KUBEVIRT_DIR}/manifests/generated/virt-api.yaml.in
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=virt-controller --namespace={{.Namespace}} --repository={{.DockerPrefix}} --version="$virtcontroller_version" --launcherVersion="$virtlauncher_version" --pullPolicy={{.ImagePullPolicy}} --verbosity={{.Verbosity}} >${KUBEVIRT_DIR}/manifests/generated/virt-controller.yaml.in
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=virt-handler --namespace={{.Namespace}} --repository={{.DockerPrefix}} --version="$virthandler_version" --pullPolicy={{.ImagePullPolicy}} --verbosity={{.Verbosity}} >${KUBEVIRT_DIR}/manifests/generated/virt-handler.yaml.in
-
 # The generation code for CSV requires a valid semver to be used.
 # But we're trying to generate a template for a CSV here from code
 # rather than an actual usable CSV. To work around this, we set the

diff --git a/manifests/generated/kubevirt-cr.yaml.in b/manifests/generated/kubevirt-cr.yaml.in
@@ -5,4 +5,5 @@ metadata:
   name: kubevirt
   namespace: {{.Namespace}}
 spec:
+  certificateRotateStrategy: {}
   imagePullPolicy: {{.ImagePullPolicy}}
diff --git a/manifests/generated/operator-csv.yaml.in b/manifests/generated/operator-csv.yaml.in
@@ -159,6 +159,14 @@ spec:
     spec:
       clusterPermissions:
       - rules:
+        - apiGroups:
+          - ""
+          resources:
+          - secrets
+          verbs:
+          - create
+          - get
+          - update
         - apiGroups:
           - kubevirt.io
           resources:
@@ -321,23 +329,6 @@ spec:
           - list
           - watch
           - patch
-        - apiGroups:
-          - admissionregistration.k8s.io
-          resources:
-          - validatingwebhookconfigurations
-          - mutatingwebhookconfigurations
-          verbs:
-          - get
-          - create
-          - update
-        - apiGroups:
-          - apiregistration.k8s.io
-          resources:
-          - apiservices
-          verbs:
-          - get
-          - create
-          - update
         - apiGroups:
           - ""
           resources:
@@ -397,16 +388,6 @@ spec:
           - get
           - list
           - watch
-        - apiGroups:
-          - ""
-          resources:
-          - secrets
-          verbs:
-          - get
-          - list
-          - delete
-          - update
-          - create
         - apiGroups:
           - ""
           resources:
@@ -548,13 +529,6 @@ spec:
           - get
           - list
           - watch
-        - apiGroups:
-          - ""
-          resources:
-          - secrets
-          verbs:
-          - create
-          - get
         - apiGroups:
           - subresources.kubevirt.io
           resources:
@@ -726,13 +700,22 @@ spec:
                   initialDelaySeconds: 5
                   timeoutSeconds: 10
                 resources: {}
+                volumeMounts:
+                - mountPath: /etc/virt-operator/certificates
+                  name: kubevirt-operator-certs
+                  readOnly: true
               priorityClassName: kubevirt-cluster-critical
               securityContext:
                 runAsNonRoot: true
               serviceAccountName: kubevirt-operator
               tolerations:
               - key: CriticalAddonsOnly
                 operator: Exists
+              volumes:
+              - name: kubevirt-operator-certs
+                secret:
+                  optional: true
+                  secretName: kubevirt-operator-certs
     strategy: deployment
   installModes:
   - supported: true

diff --git a/manifests/generated/prometheus.yaml.in b/manifests/generated/prometheus.yaml.in
diff --git a/manifests/generated/rbac-cluster.authorization.k8s.yaml.in b/manifests/generated/rbac-cluster.authorization.k8s.yaml.in