From 9fce357cc91af7f71a32268320cdf752e594c0e5 Mon Sep 17 00:00:00 2001
From: Tamal Saha <tamal@appscode.com>
Date: Wed, 3 Jan 2024 17:51:25 -0800
Subject: [PATCH] Add Memcached 1.6.22

Signed-off-by: Tamal Saha <tamal@appscode.com>
---
 catalog/kubedb/active_versions.json           |  4 ++--
 ...4.yaml => deprecated-memcached-1.5.4.yaml} | 17 +++++++++--------
 .../raw/memcached/memcached-1.5.22.yaml       |  4 ++--
 .../raw/memcached/memcached-1.6.22.yaml       | 14 ++++++++++++++
 ...4.yaml => deprecated-memcached-1.5.4.yaml} | 19 ++++++++++---------
 .../templates/memcached/memcached-1.5.22.yaml |  4 ++--
 .../templates/memcached/memcached-1.6.22.yaml | 18 ++++++++++++++++++
 7 files changed, 57 insertions(+), 23 deletions(-)
 rename catalog/kubedb/raw/memcached/{memcached-1.5.4.yaml => deprecated-memcached-1.5.4.yaml} (97%)
 create mode 100644 catalog/kubedb/raw/memcached/memcached-1.6.22.yaml
 rename charts/kubedb-catalog/templates/memcached/{memcached-1.5.4.yaml => deprecated-memcached-1.5.4.yaml} (92%)
 create mode 100644 charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml

diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
index a057e3976..8f6ba97db 100644
--- a/catalog/kubedb/active_versions.json
+++ b/catalog/kubedb/active_versions.json
@@ -38,8 +38,8 @@
     "10.4.32"
   ],
   "Memcached": [
-    "1.5.22",
-    "1.5.4-v1"
+    "1.6.22",
+    "1.5.22"
   ],
   "MongoDB": [
     "6.0.12",
diff --git a/catalog/kubedb/raw/memcached/memcached-1.5.4.yaml b/catalog/kubedb/raw/memcached/deprecated-memcached-1.5.4.yaml
similarity index 97%
rename from catalog/kubedb/raw/memcached/memcached-1.5.4.yaml
rename to catalog/kubedb/raw/memcached/deprecated-memcached-1.5.4.yaml
index d4efe001b..9d1da687a 100644
--- a/catalog/kubedb/raw/memcached/memcached-1.5.4.yaml
+++ b/catalog/kubedb/raw/memcached/deprecated-memcached-1.5.4.yaml
@@ -1,29 +1,30 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: MemcachedVersion
 metadata:
-  name: 1.5.4-v1
+  name: 1.5.4
 spec:
   db:
-    image: ghcr.io/kubedb/memcached:1.5.4-v1
+    image: ghcr.io/kubedb/memcached:1.5.4
+  deprecated: true
   exporter:
-    image: ghcr.io/kubedb/memcached-exporter:v0.4.1
+    image: ghcr.io/kubedb/operator:0.8.0
   podSecurityPolicies:
     databasePolicyName: memcached-db
-  securityContext:
-    runAsUser: 999
   version: 1.5.4
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: MemcachedVersion
 metadata:
-  name: 1.5.4
+  name: 1.5.4-v1
 spec:
   db:
-    image: ghcr.io/kubedb/memcached:1.5.4
+    image: ghcr.io/kubedb/memcached:1.5.4-v1
   deprecated: true
   exporter:
-    image: ghcr.io/kubedb/operator:0.8.0
+    image: ghcr.io/kubedb/memcached-exporter:v0.4.1
   podSecurityPolicies:
     databasePolicyName: memcached-db
+  securityContext:
+    runAsUser: 999
   version: 1.5.4
diff --git a/catalog/kubedb/raw/memcached/memcached-1.5.22.yaml b/catalog/kubedb/raw/memcached/memcached-1.5.22.yaml
index e159927c4..834b219a1 100644
--- a/catalog/kubedb/raw/memcached/memcached-1.5.22.yaml
+++ b/catalog/kubedb/raw/memcached/memcached-1.5.22.yaml
@@ -4,9 +4,9 @@ metadata:
   name: 1.5.22
 spec:
   db:
-    image: ghcr.io/kubedb/memcached:1.5.22
+    image: ghcr.io/appscode-images/memcached:1.5.22-alpine
   exporter:
-    image: ghcr.io/kubedb/memcached-exporter:v0.4.1
+    image: prom/memcached-exporter:v0.14.2
   podSecurityPolicies:
     databasePolicyName: memcached-db
   securityContext:
diff --git a/catalog/kubedb/raw/memcached/memcached-1.6.22.yaml b/catalog/kubedb/raw/memcached/memcached-1.6.22.yaml
new file mode 100644
index 000000000..caddf4f06
--- /dev/null
+++ b/catalog/kubedb/raw/memcached/memcached-1.6.22.yaml
@@ -0,0 +1,14 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MemcachedVersion
+metadata:
+  name: 1.6.22
+spec:
+  db:
+    image: ghcr.io/appscode-images/memcached:1.6.22-alpine
+  exporter:
+    image: prom/memcached-exporter:v0.14.2
+  podSecurityPolicies:
+    databasePolicyName: memcached-db
+  securityContext:
+    runAsUser: 999
+  version: 1.6.22
diff --git a/charts/kubedb-catalog/templates/memcached/memcached-1.5.4.yaml b/charts/kubedb-catalog/templates/memcached/deprecated-memcached-1.5.4.yaml
similarity index 92%
rename from charts/kubedb-catalog/templates/memcached/memcached-1.5.4.yaml
rename to charts/kubedb-catalog/templates/memcached/deprecated-memcached-1.5.4.yaml
index 4713cc469..85527402e 100644
--- a/charts/kubedb-catalog/templates/memcached/memcached-1.5.4.yaml
+++ b/charts/kubedb-catalog/templates/memcached/deprecated-memcached-1.5.4.yaml
@@ -1,19 +1,18 @@
-{{ if .Values.catalog.memcached }}
+{{ if and .Values.catalog.memcached (not .Values.skipDeprecated) }}
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: MemcachedVersion
 metadata:
-  name: '1.5.4-v1'
+  name: '1.5.4'
   labels:
     {{- include "kubedb-catalog.labels" . | nindent 4 }}
 spec:
   db:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/memcached") $) }}:1.5.4-v1'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/memcached") $) }}:1.5.4'
+  deprecated: true
   exporter:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/memcached-exporter") $) }}:v0.4.1'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/operator") $) }}:0.8.0'
   podSecurityPolicies:
     databasePolicyName: memcached-db
-  securityContext:
-    runAsUser: 999
   version: 1.5.4
 {{ end }}
 
@@ -22,16 +21,18 @@ spec:
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: MemcachedVersion
 metadata:
-  name: '1.5.4'
+  name: '1.5.4-v1'
   labels:
     {{- include "kubedb-catalog.labels" . | nindent 4 }}
 spec:
   db:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/memcached") $) }}:1.5.4'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/memcached") $) }}:1.5.4-v1'
   deprecated: true
   exporter:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/operator") $) }}:0.8.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/memcached-exporter") $) }}:v0.4.1'
   podSecurityPolicies:
     databasePolicyName: memcached-db
+  securityContext:
+    runAsUser: 999
   version: 1.5.4
 {{ end }}
diff --git a/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml b/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml
index c57e3587a..143c4c7c4 100644
--- a/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml
+++ b/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml
@@ -7,9 +7,9 @@ metadata:
     {{- include "kubedb-catalog.labels" . | nindent 4 }}
 spec:
   db:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/memcached") $) }}:1.5.22'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/memcached") $) }}:1.5.22-alpine'
   exporter:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/memcached-exporter") $) }}:v0.4.1'
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/memcached-exporter") $) }}:v0.14.2'
   podSecurityPolicies:
     databasePolicyName: memcached-db
   securityContext:
diff --git a/charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml b/charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml
new file mode 100644
index 000000000..5957b48e7
--- /dev/null
+++ b/charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml
@@ -0,0 +1,18 @@
+{{ if .Values.catalog.memcached }}
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MemcachedVersion
+metadata:
+  name: '1.6.22'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/memcached") $) }}:1.6.22-alpine'
+  exporter:
+    image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/memcached-exporter") $) }}:v0.14.2'
+  podSecurityPolicies:
+    databasePolicyName: memcached-db
+  securityContext:
+    runAsUser: 999
+  version: 1.6.22
+{{ end }}