make codegen

nirmata · Feb 18, 2025 · 705f52a · 705f52a
1 parent 0d2496e
commit 705f52a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 22 deletions.
diff --git a/charts/reports-server/README.md b/charts/reports-server/README.md
@@ -86,8 +86,8 @@ helm install reports-server --namespace reports-server --create-namespace report
 | config.db.sslkey | string | `""` | Database SSL key |
 | config.db.sslcert | string | `""` | Database SSL cert |
 | apiServicesManagement.enabled | bool | `true` | Create a helm hooks to 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 | object | `{"enabled":false,"installEphemeralReportsService":true}` | Install api services in manifest |
+| apiServicesManagement.installApiServices.enabled | bool | `false` | Store reports in reports-server |
 | apiServicesManagement.installApiServices.installEphemeralReportsService | bool | `true` | Store ephemeral reports in reports-server |
 | apiServicesManagement.image.registry | string | `"ghcr.io"` | Image registry |
 | apiServicesManagement.image.repository | string | `"nirmata/kubectl"` | Image repository |

diff --git a/config/install-etcd.yaml b/config/install-etcd.yaml
@@ -10,10 +10,10 @@ metadata:
   name: reports-server
   namespace: reports-server
   labels:
-    helm.sh/chart: reports-server-0.1.3
+    helm.sh/chart: reports-server-0.1.7-rc.2
     app.kubernetes.io/name: reports-server
     app.kubernetes.io/instance: reports-server
-    app.kubernetes.io/version: "v0.1.3"
+    app.kubernetes.io/version: "v0.1.7-rc.2"
     app.kubernetes.io/managed-by: Helm
 spec:
   selector:
@@ -68,6 +68,12 @@ rules:
     - update
     - watch
     - deletecollection
+- apiGroups:
+    - ""
+  resources:
+    - namespaces
+  verbs:
+    - get
 - apiGroups:
     - apiregistration.k8s.io
   resources:
@@ -267,10 +273,10 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: reports-server-0.1.3
+        helm.sh/chart: reports-server-0.1.7-rc.2
         app.kubernetes.io/name: reports-server
         app.kubernetes.io/instance: reports-server
-        app.kubernetes.io/version: "v0.1.3"
+        app.kubernetes.io/version: "v0.1.7-rc.2"
         app.kubernetes.io/managed-by: Helm
     spec:
       priorityClassName: system-cluster-critical
@@ -293,15 +299,15 @@ spec:
                   resource: limits.memory
                   divisor: '1'
             - name: DB_HOST
-              value: "reports-server-postgresql.reports-server"
+              value: "reports-server-cluster-rw.reports-server"
             - name: DB_PORT
-              value: "5432"
+              value: 
             - name: DB_DATABASE
               value: "reportsdb"
             - name: DB_USER
-              value: "postgres"
+              value: "app"
             - name: DB_PASSWORD
-              value: "reports"
+              value: "password"
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:

diff --git a/config/install.yaml b/config/install.yaml
@@ -10,10 +10,10 @@ metadata:
   name: reports-server
   namespace: reports-server
   labels:
-    helm.sh/chart: reports-server-0.1.3
+    helm.sh/chart: reports-server-0.1.7-rc.2
     app.kubernetes.io/name: reports-server
     app.kubernetes.io/instance: reports-server
-    app.kubernetes.io/version: "v0.1.3"
+    app.kubernetes.io/version: "v0.1.7-rc.2"
     app.kubernetes.io/managed-by: Helm
 spec:
   selector:
@@ -68,6 +68,12 @@ rules:
     - update
     - watch
     - deletecollection
+- apiGroups:
+    - ""
+  resources:
+    - namespaces
+  verbs:
+    - get
 - apiGroups:
     - apiregistration.k8s.io
   resources:
@@ -267,10 +273,10 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: reports-server-0.1.3
+        helm.sh/chart: reports-server-0.1.7-rc.2
         app.kubernetes.io/name: reports-server
         app.kubernetes.io/instance: reports-server
-        app.kubernetes.io/version: "v0.1.3"
+        app.kubernetes.io/version: "v0.1.7-rc.2"
         app.kubernetes.io/managed-by: Helm
     spec:
       priorityClassName: system-cluster-critical
@@ -280,10 +286,9 @@ spec:
       containers:
         - name: reports-server
           args:
-            - --dbsslmode=disable
-            - --dbsslrootcert=
-            - --dbsslkey=
-            - --dbsslcert=
+            - --etcd
+            - --etcdSkipTLS
+            - --etcdEndpoints=https://etcd-0.etcd.reports-server:2379,https://etcd-1.etcd.reports-server:2379,https://etcd-2.etcd.reports-server:2379
             - --cert-dir=/tmp
             - --secure-port=4443
             - --authorization-always-allow-paths=/metrics
@@ -294,15 +299,15 @@ spec:
                   resource: limits.memory
                   divisor: '1'
             - name: DB_HOST
-              value: "reports-server-postgresql.reports-server"
+              value: "reports-server-cluster-rw.reports-server"
             - name: DB_PORT
-              value: "5432"
+              value: 
             - name: DB_DATABASE
               value: "reportsdb"
             - name: DB_USER
-              value: "postgres"
+              value: "app"
             - name: DB_PASSWORD
-              value: "reports"
+              value: "password"
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:

diff --git a/pkg/app/opts/options.go b/pkg/app/opts/options.go
@@ -205,6 +205,10 @@ func (o Options) restConfig() (*rest.Config, error) {
 // because these configurations contain sensitive data, this is not read directly from command line input,
 // to enable usecases of env variable injection, such as using vault-env
 func (o *Options) dbConfig() error {
+
+	if o.Etcd == true {
+		return nil
+	}
 	o.DBHost = os.Getenv("DB_HOST")
 	o.DBName = os.Getenv("DB_DATABASE")
 	o.DBUser = os.Getenv("DB_USER")