Update Capi Version (#15)

* Update Capi Version Signed-off-by: AbdullahAlShaad <[email protected]> * Update Capi Version Signed-off-by: AbdullahAlShaad <[email protected]> * Update Chart Version Signed-off-by: AbdullahAlShaad <[email protected]> --------- Signed-off-by: AbdullahAlShaad <[email protected]>
kluster-api · Sep 24, 2024 · 8726914 · 8726914
1 parent bc8b30d
commit 8726914
Show file tree

Hide file tree

Showing 13 changed files with 114 additions and 259 deletions.
diff --git a/charts/capi-catalog/Chart.yaml b/charts/capi-catalog/Chart.yaml
@@ -1,12 +1,12 @@
 apiVersion: v2
 description: CAPI catalog by AppsCode
 name: capi-catalog
-version: v2024.7.9
-appVersion: v0.0.1
-home: https://github.com/ops-center
+version: v2024.9.24
+appVersion: v0.0.3
+home: https://appscode.com
 icon: https://cdn.appscode.com/images/products/searchlight/searchlight-512x512.png
 sources:
-- https://github.com/ops-center
+- https://github.com/kluster-api
 maintainers:
 - name: appscode
   email: [email protected]
diff --git a/charts/capi-catalog/README.md b/charts/capi-catalog/README.md
@@ -7,8 +7,8 @@
 ```bash
 $ helm repo add appscode https://charts.appscode.com/stable/
 $ helm repo update
-$ helm search repo appscode/capi-catalog --version=v2024.7.9
-$ helm upgrade -i capi-catalog appscode/capi-catalog -n kubeops --create-namespace --version=v2024.7.9
+$ helm search repo appscode/capi-catalog --version=v2024.9.24
+$ helm upgrade -i capi-catalog appscode/capi-catalog -n kubeops --create-namespace --version=v2024.9.24
 ```
 
 ## Introduction
@@ -24,7 +24,7 @@ This chart deploys CAPI catalog on a [Kubernetes](http://kubernetes.io) cluster
 To install/upgrade the chart with the release name `capi-catalog`:
 
 ```bash
-$ helm upgrade -i capi-catalog appscode/capi-catalog -n kubeops --create-namespace --version=v2024.7.9
+$ helm upgrade -i capi-catalog appscode/capi-catalog -n kubeops --create-namespace --version=v2024.9.24
 ```
 
 The command deploys CAPI catalog on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
@@ -45,21 +45,27 @@ The command removes all the Kubernetes components associated with the chart and
 
 The following table lists the configurable parameters of the `capi-catalog` chart and their default values.
 
-|    Parameter     | Description |     Default     |
-|------------------|-------------|-----------------|
-| nameOverride     |             | <code>""</code> |
-| fullnameOverride |             | <code>""</code> |
+|       Parameter       | Description |            Default             |
+|-----------------------|-------------|--------------------------------|
+| nameOverride          |             | <code>""</code>                |
+| fullnameOverride      |             | <code>""</code>                |
+| proxies.dockerHub     |             | <code>""</code>                |
+| proxies.dockerLibrary |             | <code>""</code>                |
+| proxies.ghcr          |             | <code>ghcr.io</code>           |
+| proxies.kubernetes    |             | <code>registry.k8s.io</code>   |
+| proxies.microsoft     |             | <code>mcr.microsoft.com</code> |
+| proxies.appscode      |             | <code>r.appscode.com</code>    |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:
 
 ```bash
-$ helm upgrade -i capi-catalog appscode/capi-catalog -n kubeops --create-namespace --version=v2024.7.9 --set -- generate from values file --
+$ helm upgrade -i capi-catalog appscode/capi-catalog -n kubeops --create-namespace --version=v2024.9.24 --set proxies.ghcr=ghcr.io
 ```
 
 Alternatively, a YAML file that specifies the values for the parameters can be provided while
 installing the chart. For example:
 
 ```bash
-$ helm upgrade -i capi-catalog appscode/capi-catalog -n kubeops --create-namespace --version=v2024.7.9 --values values.yaml
+$ helm upgrade -i capi-catalog appscode/capi-catalog -n kubeops --create-namespace --version=v2024.9.24 --values values.yaml
 ```
diff --git a/charts/capi-catalog/crds/catalog.klusters.dev_capiversions.yaml b/charts/capi-catalog/crds/catalog.klusters.dev_capiversions.yaml
@@ -33,91 +33,39 @@ spec:
             properties:
               capa:
                 properties:
-                  capi:
+                  deployerImage:
                     type: string
-                  clusterawsadm:
-                    type: string
-                  clusterctl:
-                    type: string
-                  dockerMachine:
-                    properties:
-                      os:
-                        type: string
-                      type:
-                        type: string
-                    type: object
-                  iamAuthenticator:
-                    type: string
-                  infrastructure:
-                    type: string
-                  kind:
-                    type: string
-                  kindImage:
+                  ebsCSIDriverVersion:
                     type: string
                 required:
-                - capi
-                - clusterawsadm
-                - clusterctl
-                - iamAuthenticator
-                - infrastructure
-                - kind
-                - kindImage
+                - deployerImage
+                - ebsCSIDriverVersion
                 type: object
               capg:
                 properties:
-                  capi:
-                    type: string
-                  clusterctl:
-                    type: string
-                  dockerMachine:
-                    properties:
-                      os:
-                        type: string
-                      type:
-                        type: string
-                    type: object
-                  infrastructure:
-                    type: string
-                  kind:
+                  deployerImage:
                     type: string
-                  kindImage:
+                required:
+                - deployerImage
+                type: object
+              caph:
+                properties:
+                  deployerImage:
                     type: string
                 required:
-                - capi
-                - clusterctl
-                - infrastructure
-                - kind
-                - kindImage
+                - deployerImage
                 type: object
               capz:
                 properties:
-                  capi:
-                    type: string
-                  clusterctl:
-                    type: string
-                  dockerMachine:
-                    properties:
-                      os:
-                        type: string
-                      type:
-                        type: string
-                    type: object
-                  infrastructure:
-                    type: string
-                  kind:
-                    type: string
-                  kindImage:
+                  deployerImage:
                     type: string
                 required:
-                - capi
-                - clusterctl
-                - infrastructure
-                - kind
-                - kindImage
+                - deployerImage
                 type: object
             required:
             - capa
             - capg
+            - caph
             - capz
             type: object
           status:

diff --git a/charts/capi-catalog/templates/_helpers.tpl b/charts/capi-catalog/templates/_helpers.tpl
@@ -52,3 +52,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- toYaml . | nindent 0 }}
 {{- end -}}
 {{- end -}}
+
+{{- define "image.ghcr" -}}
+{{ list .Values.proxies.ghcr ._repo | compact | join "/" }}
+{{- end }}
diff --git a/charts/capi-catalog/templates/k-1-27.yaml b/charts/capi-catalog/templates/k-1-27.yaml
@@ -6,30 +6,11 @@ metadata:
     {{- include "capi-catalog.labels" . | nindent 4 }}
 spec:
   capa:
-    kind: "v0.22.0"
-    kindImage: "v1.28.7"
-    clusterctl: "v1.6.3"
-    capi: "v1.6.3"
-    infrastructure: "v2.4.2"
-    clusterawsadm: "v2.4.2"
-    iamAuthenticator: "0.6.14"
-    dockerMachine:
-      type: "t2.xlarge"
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capa-deployer") $) }}:v1.27'
+    ebsCSIDriverVersion: "v1.27.0-eksbuild.1"
   capg:
-    kind: "v0.22.0"
-    kindImage: "v1.28.7"
-    clusterctl: "v1.6.3"
-    capi: "v1.6.3"
-    infrastructure: "v1.6.0"
-    dockerMachine:
-      type: "n1-standard-2"
-      os: "ubuntu-os-cloud/global/images/ubuntu-2204-jammy-v20240701"
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capg-deployer") $) }}:v1.27'
   capz:
-    kind: "v0.22.0"
-    kindImage: "v1.28.7"
-    clusterctl: "v1.6.3"
-    capi: "v1.6.3"
-    infrastructure: "v1.14.2"
-    dockerMachine:
-      type: "Standard_D2s_v3"
-      os: "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:22.04.202406140"
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capz-deployer") $) }}:v1.27'
+  caph:
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/caph-deployer") $) }}:v1.27'
diff --git a/charts/capi-catalog/templates/k-1-28.yaml b/charts/capi-catalog/templates/k-1-28.yaml
@@ -6,30 +6,11 @@ metadata:
     {{- include "capi-catalog.labels" . | nindent 4 }}
 spec:
   capa:
-    kind: "v0.22.0"
-    kindImage: "v1.28.7"
-    clusterctl: "v1.6.3"
-    capi: "v1.6.3"
-    infrastructure: "v2.4.2"
-    clusterawsadm: "v2.4.2"
-    iamAuthenticator: "0.6.14"
-    dockerMachine:
-      type: "t2.xlarge"
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capa-deployer") $) }}:v1.28'
+    ebsCSIDriverVersion: "v1.28.0-eksbuild.1"
   capg:
-    kind: "v0.22.0"
-    kindImage: "v1.28.7"
-    clusterctl: "v1.6.3"
-    capi: "v1.6.3"
-    infrastructure: "v1.6.0"
-    dockerMachine:
-      type: "n1-standard-2"
-      os: "ubuntu-os-cloud/global/images/ubuntu-2204-jammy-v20240701"
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capg-deployer") $) }}:v1.28'
   capz:
-    kind: "v0.22.0"
-    kindImage: "v1.28.7"
-    clusterctl: "v1.6.3"
-    capi: "v1.6.3"
-    infrastructure: "v1.14.2"
-    dockerMachine:
-      type: "Standard_D2s_v3"
-      os: "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:22.04.202406140"
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capz-deployer") $) }}:v1.28'
+  caph:
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/caph-deployer") $) }}:v1.28'
diff --git a/charts/capi-catalog/templates/k-1-29.yaml b/charts/capi-catalog/templates/k-1-29.yaml
@@ -6,30 +6,11 @@ metadata:
     {{- include "capi-catalog.labels" . | nindent 4 }}
 spec:
   capa:
-    kind: "v0.22.0"
-    kindImage: "v1.28.7"
-    clusterctl: "v1.6.3"
-    capi: "v1.6.3"
-    infrastructure: "v2.4.2"
-    clusterawsadm: "v2.4.2"
-    iamAuthenticator: "0.6.14"
-    dockerMachine:
-      type: "t2.xlarge"
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capa-deployer") $) }}:v1.29'
+    ebsCSIDriverVersion: "v1.29.1-eksbuild.1"
   capg:
-    kind: "v0.22.0"
-    kindImage: "v1.28.7"
-    clusterctl: "v1.6.3"
-    capi: "v1.6.3"
-    infrastructure: "v1.6.0"
-    dockerMachine:
-      type: "n1-standard-2"
-      os: "ubuntu-os-cloud/global/images/ubuntu-2204-jammy-v20240701"
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capg-deployer") $) }}:v1.29'
   capz:
-    kind: "v0.22.0"
-    kindImage: "v1.28.7"
-    clusterctl: "v1.6.3"
-    capi: "v1.6.3"
-    infrastructure: "v1.14.2"
-    dockerMachine:
-      type: "Standard_D2s_v3"
-      os: "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:22.04.202406140"
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capz-deployer") $) }}:v1.29'
+  caph:
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/caph-deployer") $) }}:v1.29'
diff --git a/charts/capi-catalog/templates/k-1-30.yaml b/charts/capi-catalog/templates/k-1-30.yaml
@@ -0,0 +1,16 @@
+apiVersion: catalog.klusters.dev/v1alpha1
+kind: CapiVersion
+metadata:
+  name: "1.30"
+  labels:
+    {{- include "capi-catalog.labels" . | nindent 4 }}
+spec:
+  capa:
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capa-deployer") $) }}:v1.30'
+    ebsCSIDriverVersion: "v1.30.0-eksbuild.1"
+  capg:
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capg-deployer") $) }}:v1.30'
+  capz:
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capz-deployer") $) }}:v1.30'
+  caph:
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/caph-deployer") $) }}:v1.30'
diff --git a/charts/capi-catalog/templates/k-1-31.yaml b/charts/capi-catalog/templates/k-1-31.yaml
@@ -0,0 +1,16 @@
+apiVersion: catalog.klusters.dev/v1alpha1
+kind: CapiVersion
+metadata:
+  name: "1.31"
+  labels:
+    {{- include "capi-catalog.labels" . | nindent 4 }}
+spec:
+  capa:
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capa-deployer") $) }}:v1.31'
+    ebsCSIDriverVersion: "v1.31.0-eksbuild.1"
+  capg:
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capg-deployer") $) }}:v1.31'
+  capz:
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/capz-deployer") $) }}:v1.31'
+  caph:
+    deployerImage: '{{ include "image.ghcr" (merge (dict "_repo" "appscode/caph-deployer") $) }}:v1.31'
diff --git a/charts/capi-catalog/templates/k-1.26.yaml b/charts/capi-catalog/templates/k-1.26.yaml
diff --git a/charts/capi-catalog/values.yaml b/charts/capi-catalog/values.yaml
@@ -4,3 +4,12 @@
 
 nameOverride: ""
 fullnameOverride: ""
+
+
+proxies:
+  dockerHub: ""
+  dockerLibrary: ""
+  ghcr: ghcr.io
+  kubernetes: registry.k8s.io
+  microsoft: mcr.microsoft.com
+  appscode: r.appscode.com
diff --git a/charts/capi-ops-manager/Chart.yaml b/charts/capi-ops-manager/Chart.yaml
@@ -3,10 +3,10 @@ description: CAPI Ops Manager by AppsCode
 name: capi-ops-manager
 version: v2024.8.14
 appVersion: v0.0.2
-home: https://github.com/ops-center
+home: https://appscode.com
 icon: https://cdn.appscode.com/images/products/searchlight/searchlight-512x512.png
 sources:
-- https://github.com/ops-center
+- https://github.com/kluster-api
 maintainers:
 - name: appscode
   email: [email protected]