Use cve-free ghcr-registry images (#890)

Signed-off-by: Arnob kumar saha <[email protected]>
kubedb · Feb 29, 2024 · 0a3062c · 0a3062c
1 parent 9b44fd8
commit 0a3062c
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 8 deletions.
diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
@@ -52,6 +52,7 @@
   "MySQL": [
     "8.2.0",
     "8.1.0",
+    "8.0.36",
     "8.0.35",
     "8.0.31-innodb",
     "5.7.44",

diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json
@@ -56,6 +56,7 @@
   "mysql-backup-8.0.21": [
     "8.2.0",
     "8.1.0",
+    "8.0.36",
     "8.0.35",
     "8.0.31-innodb"
   ],

diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.13-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.13-opensearch.yaml
@@ -5,11 +5,11 @@ metadata:
 spec:
   authPlugin: OpenSearch
   dashboard:
-    image: opensearchproject/opensearch-dashboards:1.3.13
+    image: ghcr.io/appscode-images/opensearch-dashboards:1.3.13
   dashboardInitContainer:
     yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:1.3.13-opensearch-v2023.12.07
   db:
-    image: opensearchproject/opensearch:1.3.13
+    image: ghcr.io/appscode-images/opensearch:1.3.13
   distribution: OpenSearch
   exporter:
     image: prometheuscommunity/elasticsearch-exporter:v1.3.0

diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-2.5.0-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-2.5.0-opensearch.yaml
@@ -5,11 +5,11 @@ metadata:
 spec:
   authPlugin: OpenSearch
   dashboard:
-    image: opensearchproject/opensearch-dashboards:2.5.0
+    image: ghcr.io/appscode-images/opensearch-dashboards:2.5.0
   dashboardInitContainer:
     yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:2.5.0-opensearch-v2023.12.07
   db:
-    image: opensearchproject/opensearch:2.5.0
+    image: ghcr.io/appscode-images/opensearch:2.5.0
   distribution: OpenSearch
   exporter:
     image: prometheuscommunity/elasticsearch-exporter:v1.3.0

diff --git a/catalog/kubedb/raw/mysql/mysql-8.0.35-official.yaml b/catalog/kubedb/raw/mysql/mysql-8.0.35-official.yaml
@@ -45,3 +45,52 @@ spec:
       standalone:
       - < 8.0.35
   version: 8.0.35
+
+---
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MySQLVersion
+metadata:
+  name: 8.0.36
+spec:
+  archiver:
+    addon:
+      name: mysql-addon
+      tasks:
+        manifestBackup:
+          name: ManifestBackup
+        manifestRestore:
+          name: ManifestRestore
+        volumeSnapshot:
+          name: VolumeSnapshot
+    walg:
+      image: ghcr.io/kubedb/mysql-archiver:(v0.1.0)_8.0.35
+  coordinator:
+    image: ghcr.io/kubedb/mysql-coordinator:v0.18.0
+  db:
+    image: ghcr.io/appscode-images/mysql:8.0.36-debian
+  distribution: Official
+  exporter:
+    image: ghcr.io/kubedb/mysqld-exporter:v0.13.1
+  gitSyncer:
+    image: registry.k8s.io/git-sync/git-sync:v4.1.0
+  initContainer:
+    image: ghcr.io/kubedb/mysql-init:8.0.31-v3
+  podSecurityPolicies:
+    databasePolicyName: mysql-db
+  replicationModeDetector:
+    image: ghcr.io/kubedb/replication-mode-detector:v0.27.0
+  securityContext:
+    runAsUser: 999
+  stash:
+    addon:
+      backupTask:
+        name: mysql-backup-8.0.21
+      restoreTask:
+        name: mysql-restore-8.0.21
+  updateConstraints:
+    denylist:
+      groupReplication:
+      - < 8.0.35
+      standalone:
+      - < 8.0.35
+  version: 8.0.35
diff --git a/catalog/kubedb/restore_tasks.json b/catalog/kubedb/restore_tasks.json
@@ -56,6 +56,7 @@
   "mysql-restore-8.0.21": [
     "8.2.0",
     "8.1.0",
+    "8.0.36",
     "8.0.35",
     "8.0.31-innodb"
   ],

diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml
@@ -8,11 +8,11 @@ metadata:
 spec:
   authPlugin: OpenSearch
   dashboard:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "opensearchproject/opensearch-dashboards") $) }}:1.3.13'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch-dashboards") $) }}:1.3.13'
   dashboardInitContainer:
     yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:1.3.13-opensearch-v2023.12.07'
   db:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "opensearchproject/opensearch") $) }}:1.3.13'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch") $) }}:1.3.13'
   distribution: OpenSearch
   exporter:
     image: '{{ include "image.dockerHub" (merge (dict "_repo" "prometheuscommunity/elasticsearch-exporter") $) }}:v1.3.0'

diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.5.0-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.5.0-opensearch.yaml
@@ -8,11 +8,11 @@ metadata:
 spec:
   authPlugin: OpenSearch
   dashboard:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "opensearchproject/opensearch-dashboards") $) }}:2.5.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch-dashboards") $) }}:2.5.0'
   dashboardInitContainer:
     yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:2.5.0-opensearch-v2023.12.07'
   db:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "opensearchproject/opensearch") $) }}:2.5.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch") $) }}:2.5.0'
   distribution: OpenSearch
   exporter:
     image: '{{ include "image.dockerHub" (merge (dict "_repo" "prometheuscommunity/elasticsearch-exporter") $) }}:v1.3.0'

diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.35-official.yaml b/charts/kubedb-catalog/templates/mysql/mysql-8.0.35-official.yaml
@@ -49,3 +49,56 @@ spec:
       - < 8.0.35
   version: 8.0.35
 {{ end }}
+
+---
+{{ if .Values.catalog.mysql }}
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MySQLVersion
+metadata:
+  name: '8.0.36'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  archiver:
+    addon:
+      name: mysql-addon
+      tasks:
+        manifestBackup:
+          name: ManifestBackup
+        manifestRestore:
+          name: ManifestRestore
+        volumeSnapshot:
+          name: VolumeSnapshot
+    walg:
+      image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-archiver") $) }}:v0.1.0_8.0.35'
+  coordinator:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-coordinator") $) }}:v0.18.0'
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mysql") $) }}:8.0.36-debian'
+  distribution: Official
+  exporter:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1'
+  gitSyncer:
+    image: '{{ include "image.kubernetes" (merge (dict "_repo" "git-sync/git-sync") $) }}:v4.1.0'
+  initContainer:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-init") $) }}:8.0.31-v3'
+  podSecurityPolicies:
+    databasePolicyName: mysql-db
+  replicationModeDetector:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/replication-mode-detector") $) }}:v0.27.0'
+  securityContext:
+    runAsUser: 999
+  stash:
+    addon:
+      backupTask:
+        name: mysql-backup-8.0.21
+      restoreTask:
+        name: mysql-restore-8.0.21
+  updateConstraints:
+    denylist:
+      groupReplication:
+      - < 8.0.35
+      standalone:
+      - < 8.0.35
+  version: 8.0.35
+{{ end }}