Merge pull request #794 from kubefirst/civo-upgrade

feat,fix: civo,google,vultr argo upgrade and vultr fix

Author: jokestax

civo-github/templates/mgmt/components/argocd/kustomization.yaml

@@ -5,7 +5,7 @@ namespace: argocd
 # To upgrade ArgoCD, increment the version here
 # https://github.com/argoproj/argo-cd/tags
 resources:
-  - github.com:kubefirst/manifests.git/argocd/cloud?ref=0.1.0
+  - github.com:konstructio/manifests.git/argocd/cloud?ref=v1.1.0
   - argocd-ui-ingress.yaml
   - externalsecrets.yaml
   - argocd-oidc-restart-job.yaml

civo-github/terraform/civo/main.tf

@@ -38,11 +38,11 @@ resource "civo_firewall" "kubefirst" {
 }
 
 resource "civo_kubernetes_cluster" "kubefirst" {
-  name             = local.cluster_name
-  network_id       = civo_network.kubefirst.id
-  firewall_id      = civo_firewall.kubefirst.id
-  cluster_type     = "talos"
-  write_kubeconfig = true
+  name                = local.cluster_name
+  network_id          = civo_network.kubefirst.id
+  firewall_id         = civo_firewall.kubefirst.id
+  kubernetes_version  = "1.28.7-k3s1"
+  write_kubeconfig    = true
   pools {
     label      = local.cluster_name
     size       = "<NODE_TYPE>"

civo-github/terraform/civo/modules/workload-cluster/main.tf

@@ -9,10 +9,11 @@ resource "civo_firewall" "kubefirst" {
 }
 
 resource "civo_kubernetes_cluster" "kubefirst" {
-  name             = var.cluster_name
-  network_id       = civo_network.kubefirst.id
-  firewall_id      = civo_firewall.kubefirst.id
-  write_kubeconfig = true
+  name                = var.cluster_name
+  network_id          = civo_network.kubefirst.id
+  firewall_id         = civo_firewall.kubefirst.id
+  kubernetes_version  = "1.28.7-k3s1"
+  write_kubeconfig    = true
   pools {
     label      = var.cluster_name
     size       = var.node_type

civo-gitlab/templates/mgmt/components/argocd/kustomization.yaml

@@ -5,7 +5,7 @@ namespace: argocd
 # To upgrade ArgoCD, increment the version here
 # https://github.com/argoproj/argo-cd/tags
 resources:
-  - github.com:kubefirst/manifests.git/argocd/cloud?ref=main
+  - github.com:konstructio/manifests.git/argocd/cloud?ref=v1.1.0
   - argocd-ui-ingress.yaml
   - externalsecrets.yaml
   - argocd-oidc-restart-job.yaml

civo-gitlab/terraform/civo/main.tf

@@ -40,11 +40,11 @@ resource "civo_firewall" "kubefirst" {
 }
 
 resource "civo_kubernetes_cluster" "kubefirst" {
-  name             = local.cluster_name
-  network_id       = civo_network.kubefirst.id
-  firewall_id      = civo_firewall.kubefirst.id
-  cluster_type     = "talos"
-  write_kubeconfig = true
+  name                = local.cluster_name
+  network_id          = civo_network.kubefirst.id
+  firewall_id         = civo_firewall.kubefirst.id
+  kubernetes_version  = "1.28.7-k3s1"
+  write_kubeconfig    = true
   pools {
     label      = local.cluster_name
     size       = "<NODE_TYPE>"

civo-gitlab/terraform/civo/modules/workload-cluster/main.tf

@@ -9,10 +9,11 @@ resource "civo_firewall" "kubefirst" {
 }
 
 resource "civo_kubernetes_cluster" "kubefirst" {
-  name             = var.cluster_name
-  network_id       = civo_network.kubefirst.id
-  firewall_id      = civo_firewall.kubefirst.id
-  write_kubeconfig = true
+  name                = var.cluster_name
+  network_id          = civo_network.kubefirst.id
+  firewall_id         = civo_firewall.kubefirst.id
+  kubernetes_version  = "1.28.7-k3s1"
+  write_kubeconfig    = true
   pools {
     label      = var.cluster_name
     size       = var.node_type

google-github/templates/mgmt/components/argocd/kustomization.yaml

@@ -5,7 +5,7 @@ namespace: argocd
 # To upgrade ArgoCD, increment the version here
 # https://github.com/argoproj/argo-cd/tags
 resources:
-  - github.com:kubefirst/manifests.git/argocd/cloud?ref=main
+  - github.com:konstructio/manifests.git/argocd/cloud?ref=v1.1.0
   - argocd-ui-ingress.yaml
   - externalsecrets.yaml
   - argocd-oidc-restart-job.yaml

google-gitlab/templates/mgmt/components/argocd/kustomization.yaml

@@ -5,7 +5,7 @@ namespace: argocd
 # To upgrade ArgoCD, increment the version here
 # https://github.com/argoproj/argo-cd/tags
 resources:
-  - github.com:kubefirst/manifests.git/argocd/cloud?ref=main
+  - github.com:konstructio/manifests.git/argocd/cloud?ref=v1.1.0
   - argocd-ui-ingress.yaml
   - externalsecrets.yaml
   - argocd-oidc-restart-job.yaml

vultr-github/templates/mgmt/components/argocd/kustomization.yaml

@@ -5,7 +5,7 @@ namespace: argocd
 # To upgrade ArgoCD, increment the version here
 # https://github.com/argoproj/argo-cd/tags
 resources:
-  - github.com:kubefirst/manifests.git/argocd/cloud?ref=main
+  - github.com:konstructio/manifests.git/argocd/cloud?ref=v1.1.0
   - argocd-ui-ingress.yaml
   - externalsecrets.yaml
   - argocd-oidc-restart-job.yaml

vultr-github/terraform/vault/secrets.tf

@@ -56,6 +56,16 @@ resource "vault_generic_secret" "docker_config" {
   )
 }
 
+resource "vault_generic_secret" "regsitry_auth" {
+  path = "${vault_mount.secret.path}/registry-auth"
+
+  data_json = jsonencode(
+    {
+      auth = jsonencode({ "auths" : { "ghcr.io" : { "auth" : "${var.b64_docker_auth}" } } }),
+    }
+  )
+}
+
 resource "vault_generic_secret" "metaphor" {
   for_each = toset(["development", "staging", "production"])