Merge branch 'update-redis-v2' into 'main'

add ha-redis

See merge request !24

chart/deps/redis/values.schema.json

+{
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "usePassword": {
+      "type": "boolean",
+      "title": "Use password authentication",
+      "form": true
+    },
+    "password": {
+      "type": "string",
+      "title": "Password",
+      "form": true,
+      "description": "Defaults to a random 10-character alphanumeric string if not set",
+      "hidden": {
+        "value": false,
+        "path": "usePassword"
+      }
+    },
+    "cluster": {
+      "type": "object",
+      "title": "Cluster Settings",
+      "form": true,
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "form": true,
+          "title": "Enable master-slave",
+          "description": "Enable master-slave architecture"
+        },
+        "slaveCount": {
+          "type": "integer",
+          "title": "Slave Replicas",
+          "form": true,
+          "hidden": {
+            "value": false,
+            "path": "cluster/enabled"
+          }
+        }
+      }
+    },
+    "master": {
+      "type": "object",
+      "title": "Master replicas settings",
+      "form": true,
+      "properties": {
+        "persistence": {
+          "type": "object",
+          "title": "Persistence for master replicas",
+          "form": true,
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "form": true,
+              "title": "Enable persistence",
+              "description": "Enable persistence using Persistent Volume Claims"
+            },
+            "size": {
+              "type": "string",
+              "title": "Persistent Volume Size",
+              "form": true,
+              "render": "slider",
+              "sliderMin": 1,
+              "sliderMax": 100,
+              "sliderUnit": "Gi",
+              "hidden": {
+                "value": false,
+                "path": "master/persistence/enabled"
+              }
+            },
+            "matchLabels": {
+              "type": "object",
+              "title": "Persistent Match Labels Selector"
+            },
+            "matchExpressions": {
+              "type": "object",
+              "title": "Persistent Match Expressions Selector"
+            }
+          }
+        }
+      }
+    },
+    "slave": {
+      "type": "object",
+      "title": "Slave replicas settings",
+      "form": true,
+      "hidden": {
+        "value": false,
+        "path": "cluster/enabled"
+      },
+      "properties": {
+        "persistence": {
+          "type": "object",
+          "title": "Persistence for slave replicas",
+          "form": true,
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "form": true,
+              "title": "Enable persistence",
+              "description": "Enable persistence using Persistent Volume Claims"
+            },
+            "size": {
+              "type": "string",
+              "title": "Persistent Volume Size",
+              "form": true,
+              "render": "slider",
+              "sliderMin": 1,
+              "sliderMax": 100,
+              "sliderUnit": "Gi",
+              "hidden": {
+                "value": false,
+                "path": "slave/persistence/enabled"
+              }
+            },
+            "matchLabels": {
+              "type": "object",
+              "title": "Persistent Match Labels Selector"
+            },
+            "matchExpressions": {
+              "type": "object",
+              "title": "Persistent Match Expressions Selector"
+            }
+          }
+        }
+      }
+    },
+    "volumePermissions": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "form": true,
+          "title": "Enable Init Containers",
+          "description": "Use an init container to set required folder permissions on the data volume before mounting it in the final destination"
+        }
+      }
+    },
+    "metrics": {
+      "type": "object",
+      "form": true,
+      "title": "Prometheus metrics details",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "title": "Create Prometheus metrics exporter",
+          "description": "Create a side-car container to expose Prometheus metrics",
+          "form": true
+        },
+        "serviceMonitor": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "title": "Create Prometheus Operator ServiceMonitor",
+              "description": "Create a ServiceMonitor to track metrics using Prometheus Operator",
+              "form": true,
+              "hidden": {
+                "value": false,
+                "path": "metrics/enabled"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

chart/values.yaml

@@ -1042,23 +1042,7 @@ anchoreEnterpriseUi:
 # Anchore Engine Enterprise UI is dependent on redis for storing sessions
 # Only utilized if 'anchoreEnterpriseUi.enabled: true'
 anchore-ui-redis:
-  # Use Ironbank image + pull secret
-  image:
-    registry: registry1.dso.mil/ironbank
-    repository: opensource/redis/redis6
-    tag: 6.0.4
-    pullSecrets:
-      - private-registry
-  # Use Ironbank start-up script
-  master:
-    command: "docker-entrypoint.sh"
-  slave:
-    command: "docker-entrypoint.sh"
   password: anchore-redis,123
-  cluster:
-    enabled: false
-  persistence:
-    enabled: false
 
   # To use an external redis endpoint, uncomment to set 'enabled: false'
   # enabled: false

docs/BBCHANGES.md

@@ -78,14 +78,6 @@ anchore-feeds-db:
 anchoreEnterpriseUi:
   image: registry1.dso.mil/ironbank/anchore/enterpriseui/enterpriseui:2.4.1
   imagePullSecretName: private-registry
-
-anchore-ui-redis:
-  image:
-    registry: registry1.dso.mil/ironbank
-    repository: opensource/redis/redis6
-    tag: 6.0.4
-    pullSecrets:
-      - private-registry
 ```
 
 To support the Ironbank Postgres image, additional configuration has to be set in the values file:
@@ -116,15 +108,6 @@ anchore-feeds-db:
     host all all all md5
 ```
 
-The redis startup command must be edited to use the Ironbank entrypoint:
-
-```yaml
-anchore-ui-redis:
-  # Use Ironbank start-up script
-  master:
-    command: "docker-entrypoint.sh"
-```
-
 To support SSO + Istio the RBAC container needs an additional env set:
 
 ```yaml