Adding missing init container fields for prometheys and auditlog ui

Signed-off-by: Lenin Alevski <alevsk.8772@gmail.com>
minio · Jun 10, 2022 · dc2fbbd · dc2fbbd
1 parent c509e5d
commit dc2fbbd
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 23 deletions.
diff --git a/models/tenant_logs.go b/models/tenant_logs.go
diff --git a/operatorapi/embedded_spec.go b/operatorapi/embedded_spec.go
diff --git a/operatorapi/tenants.go b/operatorapi/tenants.go
@@ -1376,10 +1376,9 @@ func getTenantLogsResponse(session *models.Principal, params operator_api.GetTen
 		return nil, restapi.ErrorWithContext(ctx, err, restapi.ErrUnableToGetTenantLogs)
 	}
 	if minTenant.Spec.Log == nil {
-		retval := &models.TenantLogs{
+		return &models.TenantLogs{
 			Disabled: true,
-		}
-		return retval, nil
+		}, nil
 	}
 	annotations := []*models.Annotation{}
 	for k, v := range minTenant.Spec.Log.Annotations {
@@ -1415,14 +1414,15 @@ func getTenantLogsResponse(session *models.Principal, params operator_api.GetTen
 		minTenant.Spec.Log.Audit = &miniov2.AuditConfig{DiskCapacityGB: swag.Int(0)}
 	}
 
-	retval := &models.TenantLogs{
+	tenantLoggingConfiguration := &models.TenantLogs{
 		Image:                minTenant.Spec.Log.Image,
 		DiskCapacityGB:       fmt.Sprintf("%d", *minTenant.Spec.Log.Audit.DiskCapacityGB),
 		Annotations:          annotations,
 		Labels:               labels,
 		NodeSelector:         nodeSelector,
 		ServiceAccountName:   minTenant.Spec.Log.ServiceAccountName,
 		DbImage:              minTenant.Spec.Log.Db.Image,
+		DbInitImage:          minTenant.Spec.Log.Db.InitImage,
 		DbAnnotations:        dbAnnotations,
 		DbLabels:             dbLabels,
 		DbNodeSelector:       dbNodeSelector,
@@ -1434,6 +1434,7 @@ func getTenantLogsResponse(session *models.Principal, params operator_api.GetTen
 	var requestedMem string
 	var requestedDBCPU string
 	var requestedDBMem string
+
 	if minTenant.Spec.Log.Resources.Requests != nil {
 		requestedCPUQ := minTenant.Spec.Log.Resources.Requests["cpu"]
 		requestedCPU = strconv.FormatInt(requestedCPUQ.Value(), 10)
@@ -1445,12 +1446,12 @@ func getTenantLogsResponse(session *models.Principal, params operator_api.GetTen
 		requestedDBMemQ := minTenant.Spec.Log.Db.Resources.Requests["memory"]
 		requestedDBMem = strconv.FormatInt(requestedDBMemQ.Value(), 10)
 
-		retval.LogCPURequest = requestedCPU
-		retval.LogMemRequest = requestedMem
-		retval.LogDBCPURequest = requestedDBCPU
-		retval.LogDBMemRequest = requestedDBMem
+		tenantLoggingConfiguration.LogCPURequest = requestedCPU
+		tenantLoggingConfiguration.LogMemRequest = requestedMem
+		tenantLoggingConfiguration.LogDBCPURequest = requestedDBCPU
+		tenantLoggingConfiguration.LogDBMemRequest = requestedDBMem
 	}
-	return retval, nil
+	return tenantLoggingConfiguration, nil
 }
 
 // setTenantLogsResponse returns the logs of a tenant

diff --git a/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Images.tsx b/portal-ui/src/screens/Console/Tenants/AddTenant/Steps/Images.tsx
@@ -325,7 +325,7 @@ const Images = ({ classes }: IImagesProps) => {
             label="MinIO"
             value={imageName}
             error={validationErrors["image"] || ""}
-            placeholder="E.g. minio/minio:RELEASE.2022-02-26T02-54-46Z"
+            placeholder="minio/minio:RELEASE.2022-02-26T02-54-46Z"
           />
         </Grid>
 
@@ -340,7 +340,7 @@ const Images = ({ classes }: IImagesProps) => {
             label="KES"
             value={kesImage}
             error={validationErrors["kesImage"] || ""}
-            placeholder="E.g. minio/kes:v0.17.6"
+            placeholder="minio/kes:v0.17.6"
           />
         </Grid>
         <Grid item xs={12} className={classes.formFieldRow}>
@@ -357,7 +357,7 @@ const Images = ({ classes }: IImagesProps) => {
             label="API"
             value={logSearchImage}
             error={validationErrors["logSearchImage"] || ""}
-            placeholder="E.g. minio/operator:v4.4.10"
+            placeholder="minio/operator:v4.4.22"
           />
         </Grid>
         <Grid item xs={12} className={classes.formFieldRow}>
@@ -371,7 +371,7 @@ const Images = ({ classes }: IImagesProps) => {
             label="PostgreSQL"
             value={logSearchPostgresImage}
             error={validationErrors["logSearchPostgresImage"] || ""}
-            placeholder="E.g. library/postgres:13"
+            placeholder="library/postgres:13"
           />
         </Grid>
         <Grid item xs={12} className={classes.formFieldRow}>
@@ -385,7 +385,7 @@ const Images = ({ classes }: IImagesProps) => {
             label="PostgreSQL Init"
             value={logSearchPostgresInitImage}
             error={validationErrors["logSearchPostgresInitImage"] || ""}
-            placeholder="E.g. library/busybox:1.33.1"
+            placeholder="library/busybox:1.33.1"
           />
         </Grid>
         <Grid item xs={12} className={classes.formFieldRow}>
@@ -402,7 +402,7 @@ const Images = ({ classes }: IImagesProps) => {
             label="Prometheus"
             value={prometheusImage}
             error={validationErrors["prometheusImage"] || ""}
-            placeholder="E.g. quay.io/prometheus/prometheus:latest"
+            placeholder="quay.io/prometheus/prometheus:latest"
           />
         </Grid>
         <Grid item xs={12} className={classes.formFieldRow}>
@@ -416,7 +416,7 @@ const Images = ({ classes }: IImagesProps) => {
             label="Prometheus Sidecar"
             value={prometheusSidecarImage}
             error={validationErrors["prometheusSidecarImage"] || ""}
-            placeholder="E.g. quay.io/prometheus/prometheus:latest"
+            placeholder="library/alpine:latest"
           />
         </Grid>
         <Grid item xs={12} className={classes.formFieldRow}>
@@ -430,7 +430,7 @@ const Images = ({ classes }: IImagesProps) => {
             label="Prometheus Init"
             value={prometheusInitImage}
             error={validationErrors["prometheusInitImage"] || ""}
-            placeholder="E.g. quay.io/prometheus/prometheus:latest"
+            placeholder="library/busybox:1.33.1"
           />
         </Grid>
       </Fragment>
@@ -469,7 +469,7 @@ const Images = ({ classes }: IImagesProps) => {
               label="Endpoint"
               value={imageRegistry}
               error={validationErrors["registry"] || ""}
-              placeholder="E.g. https://index.docker.io/v1/"
+              placeholder="https://index.docker.io/v1/"
               required
             />
           </Grid>

diff --git a/portal-ui/src/screens/Console/Tenants/ListTenants/types.ts b/portal-ui/src/screens/Console/Tenants/ListTenants/types.ts
@@ -227,6 +227,7 @@ export interface ITenantLogsStruct {
   diskCapacityGB: number;
   serviceAccountName: string;
   dbImage: string;
+  dbInitImage: string;
   dbLabels: IKeyValue[];
   dbAnnotations: IKeyValue[];
   dbNodeSelector: IKeyValue[];

diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/EditTenantLogsModal.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/EditTenantLogsModal.tsx
@@ -52,6 +52,7 @@ interface IEditTenantLogsProps {
   diskCapacityGB: number;
   serviceAccountName: string;
   dbImage: string;
+  dbInitImage: string;
   dbLabels: IKeyValue[];
   dbAnnotations: IKeyValue[];
   dbNodeSelector: IKeyValue[];
@@ -96,6 +97,7 @@ const EditTenantLogsModal = ({
   dbAnnotations,
   dbNodeSelector,
   dbImage,
+  dbInitImage,
   dbServiceAccountName,
   cpuRequest,
   memRequest,
@@ -129,6 +131,7 @@ const EditTenantLogsModal = ({
     dbNodeSelector.length > 0 ? [...dbNodeSelector] : [{ key: "", value: "" }]
   );
   const [newDbImage, setNewDbImage] = useState<string>(dbImage);
+  const [newDbInitImage, setNewDbInitImage] = useState<string>(dbInitImage);
   const [newDbServiceAccountName, setNewDbServiceAccountName] =
     useState<string>(dbServiceAccountName != null ? dbServiceAccountName : "");
   const [labelsError, setLabelsError] = useState<any>({});
@@ -183,6 +186,14 @@ const EditTenantLogsModal = ({
         /^([a-zA-Z0-9])([a-zA-Z0-9-._])*([a-zA-Z0-9]?)+(\/(([a-zA-Z0-9])([a-zA-Z0-9-._])*([a-zA-Z0-9])?)+)*:([a-zA-Z0-9])[a-zA-Z0-9-.]{0,127}$/,
       customPatternMessage: "Invalid image",
     });
+    tenantLogValidation.push({
+      fieldKey: `dbInitImage`,
+      required: false,
+      value: newDbInitImage,
+      pattern:
+        /^([a-zA-Z0-9])([a-zA-Z0-9-._])*([a-zA-Z0-9]?)+(\/(([a-zA-Z0-9])([a-zA-Z0-9-._])*([a-zA-Z0-9])?)+)*:([a-zA-Z0-9])[a-zA-Z0-9-.]{0,127}$/,
+      customPatternMessage: "Invalid image",
+    });
     tenantLogValidation.push({
       fieldKey: `diskCapacityGB`,
       required: true,
@@ -302,6 +313,7 @@ const EditTenantLogsModal = ({
                   dbAnnotations: trim(newDbAnnotations),
                   dbNodeSelector: trim(newDbNodeSelector),
                   dbImage: newDbImage,
+                  dbInitImage: newDbInitImage,
                   dbServiceAccountName: newDbServiceAccountName,
                   logCPURequest: newCPURequest,
                   logMemRequest: newMemRequest + "Gi",
@@ -325,7 +337,7 @@ const EditTenantLogsModal = ({
               <InputBoxWrapper
                 id={`image`}
                 label={"Image"}
-                placeholder={"Image"}
+                placeholder={"minio/operator:v4.4.22"}
                 name={`image`}
                 value={newImage}
                 onChange={(e) => {
@@ -453,7 +465,7 @@ const EditTenantLogsModal = ({
               <InputBoxWrapper
                 id={`dbImage`}
                 label={"Postgres Image"}
-                placeholder={"Db Image"}
+                placeholder={"library/postgres:13"}
                 name={`dbImage`}
                 value={newDbImage}
                 onChange={(e) => {
@@ -464,6 +476,21 @@ const EditTenantLogsModal = ({
                 error={validationErrors[`dbImage`] || ""}
               />
             </Grid>
+            <Grid item xs={12} className={classes.formFieldRow}>
+              <InputBoxWrapper
+                id={`dbInitImage`}
+                label={"Postgres Init Image"}
+                placeholder={"library/busybox:1.33.1"}
+                name={`dbInitImage`}
+                value={newDbInitImage}
+                onChange={(e) => {
+                  setNewDbInitImage(e.target.value);
+                  cleanValidation(`dbInitImage`);
+                }}
+                key={`dbInitImage`}
+                error={validationErrors[`dbInitImage`] || ""}
+              />
+            </Grid>
             <Grid item xs={12} className={classes.formFieldRow}>
               <InputBoxWrapper
                 id={`dbServiceAccountName`}

diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/EditTenantMonitoringModal.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/EditTenantMonitoringModal.tsx
@@ -248,7 +248,7 @@ const EditTenantMonitoringModal = ({
               <InputBoxWrapper
                 id={`image`}
                 label={"Image"}
-                placeholder={"Image"}
+                placeholder={"quay.io/prometheus/prometheus:latest"}
                 name={`image`}
                 value={newImage}
                 onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
@@ -262,7 +262,7 @@ const EditTenantMonitoringModal = ({
               <InputBoxWrapper
                 id={`sidecarImage`}
                 label={"Sidecar Image"}
-                placeholder={"Sidecar Image"}
+                placeholder={"library/alpine:latest"}
                 name={`sidecarImage`}
                 value={newSidecarImage}
                 onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
@@ -276,7 +276,7 @@ const EditTenantMonitoringModal = ({
               <InputBoxWrapper
                 id={`initImage`}
                 label={"Init Image"}
-                placeholder={"Init Image"}
+                placeholder={"library/busybox:1.33.1"}
                 name={`initImage`}
                 value={newInitImage}
                 onChange={(event: React.ChangeEvent<HTMLInputElement>) => {

diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantLogging.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantLogging.tsx
@@ -197,6 +197,7 @@ const TenantLogging = ({ classes }: ITenantLogs) => {
           diskCapacityGB={logInfo.diskCapacityGB}
           serviceAccountName={logInfo.serviceAccountName}
           dbImage={logInfo.dbImage}
+          dbInitImage={logInfo.dbInitImage}
           dbLabels={logInfo.dbLabels}
           dbAnnotations={logInfo.dbAnnotations}
           dbNodeSelector={logInfo.dbNodeSelector}

diff --git a/swagger-operator.yml b/swagger-operator.yml
@@ -2912,6 +2912,8 @@ definitions:
         type: string
       dbImage:
         type: string
+      dbInitImage:
+        type: string
       dbLabels:
         type: array
         items: