Skip to content

Commit 8d31549

Browse files
rsafonsecarsafonseca
authored
Automatic migration (#249)
1 parent 231f69f commit 8d31549

File tree

13 files changed

+439
-554
lines changed

13 files changed

+439
-554
lines changed

‎.github/actions/failure-logs/action.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ runs:
77
steps:
88
- shell: bash
99
run: |
10-
kubectl get apiservices v1alpha2.wgpolicyk8s.io v1.reports.kyverno.io
11-
kubectl -n reports-server get pod
12-
kubectl -n reports-server describe pod | grep -i events -A10
10+
kubectl get apiservices v1alpha2.wgpolicyk8s.io v1.reports.kyverno.io || true
11+
kubectl -n reports-server get pod || true
12+
kubectl -n reports-server describe pod | grep -i events -A10 || true
1313
- shell: bash
1414
run: |
1515
kubectl -n reports-server logs deploy/reports-server --all-containers -p || true

‎charts/reports-server/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ helm install reports-server --namespace reports-server --create-namespace report
8585
| config.db.sslrootcert | string | `""` | Database SSL root cert |
8686
| config.db.sslkey | string | `""` | Database SSL key |
8787
| config.db.sslcert | string | `""` | Database SSL cert |
88-
| apiServicesManagement.enabled | bool | `true` | Create a helm hooks to install and delete api services |
89-
| apiServicesManagement.installApiServices | object | `{"enabled":false,"installEphemeralReportsService":true}` | Install api services in manifest |
90-
| apiServicesManagement.installApiServices.enabled | bool | `false` | Store reports in reports-server |
88+
| apiServicesManagement.enabled | bool | `true` | Create a helm hooks delete api services on uninstall |
89+
| apiServicesManagement.installApiServices | object | `{"enabled":true,"installEphemeralReportsService":true}` | Install api services in manifest |
90+
| apiServicesManagement.installApiServices.enabled | bool | `true` | Store reports in reports-server |
9191
| apiServicesManagement.installApiServices.installEphemeralReportsService | bool | `true` | Store ephemeral reports in reports-server |
9292
| apiServicesManagement.image.registry | string | `"docker.io"` | Image registry |
9393
| apiServicesManagement.image.repository | string | `"bitnami/kubectl"` | Image repository |

‎charts/reports-server/templates/api-service.yaml

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎charts/reports-server/templates/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ spec:
5454
- --dbsslrootcert={{ .Values.config.db.sslrootcert }}
5555
- --dbsslkey={{ .Values.config.db.sslkey }}
5656
- --dbsslcert={{ .Values.config.db.sslcert }}
57+
- --servicename={{ include "reports-server.fullname" . }}
58+
- --servicens={{ $.Release.Namespace }}
59+
- --storereports={{ .Values.apiServicesManagement.installApiServices.enabled }}
60+
- --storeephemeralreports={{ .Values.apiServicesManagement.installApiServices.installEphemeralReportsService }}
5761
{{- end }}
5862
- --cert-dir=/tmp
5963
- --secure-port=4443

‎charts/reports-server/templates/hooks/post-install-api-services.yaml

Lines changed: 0 additions & 128 deletions
This file was deleted.

‎charts/reports-server/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,14 @@ config:
227227
sslcert: ""
228228

229229
apiServicesManagement:
230-
# -- Create a helm hooks to install and delete api services
230+
# -- Create a helm hooks delete api services on uninstall
231231
enabled: true
232232

233233
# -- Install api services in manifest
234234
installApiServices:
235235

236236
# -- Store reports in reports-server
237-
enabled: false
237+
enabled: true
238238

239239
# -- Store ephemeral reports in reports-server
240240
installEphemeralReportsService: true

‎config/install-etcd.yaml

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -484,51 +484,3 @@ spec:
484484
resources:
485485
requests:
486486
storage: 1Gi
487-
---
488-
apiVersion: apiregistration.k8s.io/v1
489-
kind: APIService
490-
metadata:
491-
name: v1alpha2.wgpolicyk8s.io
492-
namespace: reports-server
493-
labels:
494-
helm.sh/chart: reports-server-0.1.2
495-
app.kubernetes.io/name: reports-server
496-
app.kubernetes.io/instance: reports-server
497-
app.kubernetes.io/version: "v0.1.2"
498-
app.kubernetes.io/managed-by: Helm
499-
kube-aggregator.kubernetes.io/automanaged: "false"
500-
annotations:
501-
helm.sh/hook: post-install
502-
spec:
503-
group: wgpolicyk8s.io
504-
groupPriorityMinimum: 100
505-
insecureSkipTLSVerify: true
506-
service:
507-
name: reports-server
508-
namespace: reports-server
509-
version: v1alpha2
510-
versionPriority: 100
511-
---
512-
apiVersion: apiregistration.k8s.io/v1
513-
kind: APIService
514-
metadata:
515-
name: v1.reports.kyverno.io
516-
namespace: reports-server
517-
labels:
518-
helm.sh/chart: reports-server-0.1.2
519-
app.kubernetes.io/name: reports-server
520-
app.kubernetes.io/instance: reports-server
521-
app.kubernetes.io/version: "v0.1.2"
522-
app.kubernetes.io/managed-by: Helm
523-
kube-aggregator.kubernetes.io/automanaged: "false"
524-
annotations:
525-
helm.sh/hook: post-install
526-
spec:
527-
group: reports.kyverno.io
528-
groupPriorityMinimum: 100
529-
insecureSkipTLSVerify: true
530-
service:
531-
name: reports-server
532-
namespace: reports-server
533-
version: v1
534-
versionPriority: 100

‎config/install.yaml

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,10 @@ spec:
341341
- --dbsslrootcert=
342342
- --dbsslkey=
343343
- --dbsslcert=
344+
- --servicename=reports-server
345+
- --servicens=reports-server
346+
- --storereports=true
347+
- --storeephemeralreports=true
344348
- --cert-dir=/tmp
345349
- --secure-port=4443
346350
- --authorization-always-allow-paths=/metrics
@@ -572,51 +576,3 @@ spec:
572576
resources:
573577
requests:
574578
storage: "8Gi"
575-
---
576-
apiVersion: apiregistration.k8s.io/v1
577-
kind: APIService
578-
metadata:
579-
name: v1alpha2.wgpolicyk8s.io
580-
namespace: reports-server
581-
labels:
582-
helm.sh/chart: reports-server-0.1.2
583-
app.kubernetes.io/name: reports-server
584-
app.kubernetes.io/instance: reports-server
585-
app.kubernetes.io/version: "v0.1.2"
586-
app.kubernetes.io/managed-by: Helm
587-
kube-aggregator.kubernetes.io/automanaged: "false"
588-
annotations:
589-
helm.sh/hook: post-install
590-
spec:
591-
group: wgpolicyk8s.io
592-
groupPriorityMinimum: 100
593-
insecureSkipTLSVerify: true
594-
service:
595-
name: reports-server
596-
namespace: reports-server
597-
version: v1alpha2
598-
versionPriority: 100
599-
---
600-
apiVersion: apiregistration.k8s.io/v1
601-
kind: APIService
602-
metadata:
603-
name: v1.reports.kyverno.io
604-
namespace: reports-server
605-
labels:
606-
helm.sh/chart: reports-server-0.1.2
607-
app.kubernetes.io/name: reports-server
608-
app.kubernetes.io/instance: reports-server
609-
app.kubernetes.io/version: "v0.1.2"
610-
app.kubernetes.io/managed-by: Helm
611-
kube-aggregator.kubernetes.io/automanaged: "false"
612-
annotations:
613-
helm.sh/hook: post-install
614-
spec:
615-
group: reports.kyverno.io
616-
groupPriorityMinimum: 100
617-
insecureSkipTLSVerify: true
618-
service:
619-
name: reports-server
620-
namespace: reports-server
621-
version: v1
622-
versionPriority: 100

‎go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ require (
1616
k8s.io/client-go v0.29.2
1717
k8s.io/component-base v0.29.2
1818
k8s.io/klog/v2 v2.130.1
19+
k8s.io/kube-aggregator v0.29.2
1920
k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1
2021
sigs.k8s.io/wg-policy-prototypes v0.0.0-20231226153523-db3ef51d230f
2122
)

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
10761076
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
10771077
k8s.io/kms v0.29.2 h1:MDsbp98gSlEQs7K7dqLKNNTwKFQRYYvO4UOlBOjNy6Y=
10781078
k8s.io/kms v0.29.2/go.mod h1:s/9RC4sYRZ/6Tn6yhNjbfJuZdb8LzlXhdlBnKizeFDo=
1079+
k8s.io/kube-aggregator v0.29.2 h1:z9qJn5wlGmGaX6EfM7OEhr6fq6SBjDKR6tPRZ/qgxeY=
1080+
k8s.io/kube-aggregator v0.29.2/go.mod h1:QEuwzmMJJsg0eg1Gv+u4cWcYeJG2+8vN8/nTXBzopUo=
10791081
k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1 h1:rtdnaWfP40MTKv7izH81gkWpZB45pZrwIxyZdPSn1mI=
10801082
k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw=
10811083
k8s.io/kubectl v0.29.2 h1:uaDYaBhumvkwz0S2XHt36fK0v5IdNgL7HyUniwb2IUo=

0 commit comments

Comments
 (0)