Automatic migration (#249)

kyverno · Feb 11, 2025 · 8d31549 · 8d31549
1 parent 231f69f
commit 8d31549
Show file tree

Hide file tree

Showing 13 changed files with 439 additions and 554 deletions.
diff --git a/.github/actions/failure-logs/action.yaml b/.github/actions/failure-logs/action.yaml
@@ -7,9 +7,9 @@ runs:
   steps:
     - shell: bash
       run: |
-        kubectl get apiservices v1alpha2.wgpolicyk8s.io v1.reports.kyverno.io
-        kubectl -n reports-server get pod
-        kubectl -n reports-server describe pod | grep -i events -A10
+        kubectl get apiservices v1alpha2.wgpolicyk8s.io v1.reports.kyverno.io || true
+        kubectl -n reports-server get pod || true
+        kubectl -n reports-server describe pod | grep -i events -A10 || true
     - shell: bash
       run: |
         kubectl -n reports-server logs deploy/reports-server --all-containers -p || true

diff --git a/charts/reports-server/README.md b/charts/reports-server/README.md
@@ -85,9 +85,9 @@ helm install reports-server --namespace reports-server --create-namespace report
 | config.db.sslrootcert | string | `""` | Database SSL root cert |
 | config.db.sslkey | string | `""` | Database SSL key |
 | config.db.sslcert | string | `""` | Database SSL cert |
-| apiServicesManagement.enabled | bool | `true` | Create a helm hooks to install and delete api services |
-| apiServicesManagement.installApiServices | object | `{"enabled":false,"installEphemeralReportsService":true}` | Install api services in manifest |
-| apiServicesManagement.installApiServices.enabled | bool | `false` | Store reports in reports-server |
+| apiServicesManagement.enabled | bool | `true` | Create a helm hooks delete api services on uninstall |
+| apiServicesManagement.installApiServices | object | `{"enabled":true,"installEphemeralReportsService":true}` | Install api services in manifest |
+| apiServicesManagement.installApiServices.enabled | bool | `true` | Store reports in reports-server |
 | apiServicesManagement.installApiServices.installEphemeralReportsService | bool | `true` | Store ephemeral reports in reports-server |
 | apiServicesManagement.image.registry | string | `"docker.io"` | Image registry |
 | apiServicesManagement.image.repository | string | `"bitnami/kubectl"` | Image repository |

diff --git a/charts/reports-server/templates/api-service.yaml b/charts/reports-server/templates/api-service.yaml
diff --git a/charts/reports-server/templates/deployment.yaml b/charts/reports-server/templates/deployment.yaml
@@ -54,6 +54,10 @@ spec:
             - --dbsslrootcert={{ .Values.config.db.sslrootcert }}
             - --dbsslkey={{ .Values.config.db.sslkey }}
             - --dbsslcert={{ .Values.config.db.sslcert }}
+            - --servicename={{ include "reports-server.fullname" . }}
+            - --servicens={{ $.Release.Namespace }}
+            - --storereports={{ .Values.apiServicesManagement.installApiServices.enabled }}
+            - --storeephemeralreports={{ .Values.apiServicesManagement.installApiServices.installEphemeralReportsService }}
             {{- end }}
             - --cert-dir=/tmp
             - --secure-port=4443

diff --git a/charts/reports-server/templates/hooks/post-install-api-services.yaml b/charts/reports-server/templates/hooks/post-install-api-services.yaml
diff --git a/charts/reports-server/values.yaml b/charts/reports-server/values.yaml
@@ -227,14 +227,14 @@ config:
     sslcert: ""
 
 apiServicesManagement:
-  # -- Create a helm hooks to install and delete api services
+  # -- Create a helm hooks delete api services on uninstall
   enabled: true
 
   # -- Install api services in manifest
   installApiServices:
 
     # -- Store reports in reports-server
-    enabled: false
+    enabled: true
 
     # -- Store ephemeral reports in reports-server
     installEphemeralReportsService: true

diff --git a/config/install-etcd.yaml b/config/install-etcd.yaml
@@ -484,51 +484,3 @@ spec:
       resources:
         requests:
           storage: 1Gi
----
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
-metadata:
-  name: v1alpha2.wgpolicyk8s.io
-  namespace: reports-server
-  labels:
-    helm.sh/chart: reports-server-0.1.2
-    app.kubernetes.io/name: reports-server
-    app.kubernetes.io/instance: reports-server
-    app.kubernetes.io/version: "v0.1.2"
-    app.kubernetes.io/managed-by: Helm
-    kube-aggregator.kubernetes.io/automanaged: "false"
-  annotations:
-    helm.sh/hook: post-install
-spec:
-  group: wgpolicyk8s.io
-  groupPriorityMinimum: 100
-  insecureSkipTLSVerify: true
-  service:
-    name: reports-server
-    namespace: reports-server
-  version: v1alpha2
-  versionPriority: 100
----
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
-metadata:
-  name: v1.reports.kyverno.io
-  namespace: reports-server
-  labels:
-    helm.sh/chart: reports-server-0.1.2
-    app.kubernetes.io/name: reports-server
-    app.kubernetes.io/instance: reports-server
-    app.kubernetes.io/version: "v0.1.2"
-    app.kubernetes.io/managed-by: Helm
-    kube-aggregator.kubernetes.io/automanaged: "false"
-  annotations:
-    helm.sh/hook: post-install
-spec:
-  group: reports.kyverno.io
-  groupPriorityMinimum: 100
-  insecureSkipTLSVerify: true
-  service:
-    name: reports-server
-    namespace: reports-server
-  version: v1
-  versionPriority: 100
diff --git a/config/install.yaml b/config/install.yaml
@@ -341,6 +341,10 @@ spec:
             - --dbsslrootcert=
             - --dbsslkey=
             - --dbsslcert=
+            - --servicename=reports-server
+            - --servicens=reports-server
+            - --storereports=true
+            - --storeephemeralreports=true
             - --cert-dir=/tmp
             - --secure-port=4443
             - --authorization-always-allow-paths=/metrics
@@ -572,51 +576,3 @@ spec:
         resources:
           requests:
             storage: "8Gi"
----
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
-metadata:
-  name: v1alpha2.wgpolicyk8s.io
-  namespace: reports-server
-  labels:
-    helm.sh/chart: reports-server-0.1.2
-    app.kubernetes.io/name: reports-server
-    app.kubernetes.io/instance: reports-server
-    app.kubernetes.io/version: "v0.1.2"
-    app.kubernetes.io/managed-by: Helm
-    kube-aggregator.kubernetes.io/automanaged: "false"
-  annotations:
-    helm.sh/hook: post-install
-spec:
-  group: wgpolicyk8s.io
-  groupPriorityMinimum: 100
-  insecureSkipTLSVerify: true
-  service:
-    name: reports-server
-    namespace: reports-server
-  version: v1alpha2
-  versionPriority: 100
----
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
-metadata:
-  name: v1.reports.kyverno.io
-  namespace: reports-server
-  labels:
-    helm.sh/chart: reports-server-0.1.2
-    app.kubernetes.io/name: reports-server
-    app.kubernetes.io/instance: reports-server
-    app.kubernetes.io/version: "v0.1.2"
-    app.kubernetes.io/managed-by: Helm
-    kube-aggregator.kubernetes.io/automanaged: "false"
-  annotations:
-    helm.sh/hook: post-install
-spec:
-  group: reports.kyverno.io
-  groupPriorityMinimum: 100
-  insecureSkipTLSVerify: true
-  service:
-    name: reports-server
-    namespace: reports-server
-  version: v1
-  versionPriority: 100
diff --git a/go.mod b/go.mod
@@ -16,6 +16,7 @@ require (
 	k8s.io/client-go v0.29.2
 	k8s.io/component-base v0.29.2
 	k8s.io/klog/v2 v2.130.1
+	k8s.io/kube-aggregator v0.29.2
 	k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1
 	sigs.k8s.io/wg-policy-prototypes v0.0.0-20231226153523-db3ef51d230f
 )

diff --git a/go.sum b/go.sum
@@ -1076,6 +1076,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kms v0.29.2 h1:MDsbp98gSlEQs7K7dqLKNNTwKFQRYYvO4UOlBOjNy6Y=
 k8s.io/kms v0.29.2/go.mod h1:s/9RC4sYRZ/6Tn6yhNjbfJuZdb8LzlXhdlBnKizeFDo=
+k8s.io/kube-aggregator v0.29.2 h1:z9qJn5wlGmGaX6EfM7OEhr6fq6SBjDKR6tPRZ/qgxeY=
+k8s.io/kube-aggregator v0.29.2/go.mod h1:QEuwzmMJJsg0eg1Gv+u4cWcYeJG2+8vN8/nTXBzopUo=
 k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1 h1:rtdnaWfP40MTKv7izH81gkWpZB45pZrwIxyZdPSn1mI=
 k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw=
 k8s.io/kubectl v0.29.2 h1:uaDYaBhumvkwz0S2XHt36fK0v5IdNgL7HyUniwb2IUo=