clean v4api-ga (#50)

Author: tuxtof

.gitignore

@@ -6,4 +6,5 @@ terraform.tfvars
 tofu/cert/tls.*
 tofu/cert/ca.*
 tofu/cert/additional_ca.crt
-files/docker.config
+files/docker.config
+tofu/tofu.tfvars

Makefile

@@ -1,3 +1,3 @@
 build:
 	docker build -t ghcr.io/nutanix-cloud-native/ntnx-api-proxy:dev --platform linux/amd64 .
-	docker push ghcr.io/nutanix-cloud-native/ntnx-api-proxy:dev
+	docker push ghcr.io/nutanix-cloud-native/ntnx-api-proxy:dev

tofu/README.md

@@ -5,8 +5,8 @@
 - Collect static IP for the API-Proxy
 - Create a DNS-record pointing to that IP
 - put necessary SSL-Certs as `tls.crt`, `tls.key` and `ca.crt` in `cert` Subfolder
-- Download, extract and upload flatcar-image into Nutanix Image Service
-  (https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img.gz)
+- Upload flatcar-image into Nutanix Image Service
+  (https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img)
 
 ## Deployment
 

tofu/compute.tf

@@ -8,12 +8,11 @@ data "nutanix_cluster" "cluster" {
   name = var.nutanix_cluster
 }
 
-data "nutanix_image" "flatcar" {
-
-  image_name = var.flatcar_image
+resource "nutanix_image" "flatcar" {
 
+  source_uri = var.flatcar_image
+  name = "flatcar_production_openstack_image"
 }
-
 resource "nutanix_virtual_machine" "ntnx-api-proxy" {
 
   name                 = var.vm_name
@@ -35,7 +34,7 @@ resource "nutanix_virtual_machine" "ntnx-api-proxy" {
     disk_size_mib   = 10000
     data_source_reference = {
         kind = "image"
-        uuid = data.nutanix_image.flatcar.id
+        uuid = nutanix_image.flatcar.id
       }
 
     device_properties {
@@ -63,6 +62,7 @@ data "ct_config" "ignition" {
     key                              = indent(10,file("${path.module}/cert/tls.key"))
     traefik_log_level                = var.traefik_log_level
     traefik_serverstransport_rootcas = var.traefik_serverstransport_rootcas
+    traefik_serverstransport_insecureskipverify = var.traefik_serverstransport_insecureskipverify
     auth_proxy                       = var.auth_proxy
     nutanix_username                 = var.nutanix_username
     nutanix_password                 = var.nutanix_password

tofu/ignition.tftpl

@@ -15,11 +15,13 @@ storage:
           NUTANIX_ENDPOINT=${nutanix_endpoint}
           TRAEFIK_LOG_LEVEL=${traefik_log_level}
           TRAEFIK_SERVERSTRANSPORT_ROOTCAS=${traefik_serverstransport_rootcas}
+          TRAEFIK_SERVERSTRANSPORT_INSECURESKIPVERIFY=${traefik_serverstransport_insecureskipverify}
           AUTH_PROXY=${auth_proxy}
           NUTANIX_USERNAME=${nutanix_username}
           NUTANIX_PASSWORD=${nutanix_password}
           DASHBOARD=${dashboard}
           TRAEFIK_METRICS_PROMETHEUS=${metrics}
+          TRAEFIK_METRICS_PROMETHEUS_ADDROUTERSLABELS=${metrics}
     - path: /etc/ssl/certs/additional_ca.pem
       mode: 0644
       contents:

tofu/tofu.tfvars_example

@@ -4,7 +4,7 @@ nutanix_endpoint   = "existing PC FQDN"
 nutanix_insecure   = false
 nutanix_subnet     = "subnet"
 nutanix_cluster    = "pe-cluster"
-flatcar_image      = "flatcar_production_openstack.img"
+flatcar_image      = "https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img"
 ssh_key            = "PATH TO SSH PUB KEY"
 vm_name            = "ntnx-api-proxy"
 vm_ip              = "IP address"
@@ -13,8 +13,9 @@ container_image    = "nutanix-cloud-native/ntnx-api-proxy"
 registry_user      = ""
 registry_pass      = ""
 
-fqdn                             = "PROXY FQDN"
-traefik_serverstransport_rootcas = "/etc/traefik/cert/ca.crt"
-traefik_log_level                = "info" # #possible values info / error
-dashboard                        = "enable" #possible values enable / disable
-metrics                          = "true" #enable Prometheus Metrics
+fqdn                                        = "PROXY FQDN"
+traefik_serverstransport_insecureskipverify = "false"
+traefik_serverstransport_rootcas            = "/etc/traefik/cert/ca.crt"
+traefik_log_level                           = "info" # #possible values info / error
+dashboard                                   = "enable" #possible values enable / disable
+metrics                                     = "true" #enable Prometheus Metrics

tofu/variables.tf

@@ -52,6 +52,10 @@ variable "traefik_serverstransport_rootcas" {
   default = ""
 }
 
+variable "traefik_serverstransport_insecureskipverify" {
+  type = string
+  default = ""
+}
 variable "traefik_log_level" {
   type = string
 }

traefik.d/pc-v4.yml

@@ -14,6 +14,18 @@
 "/api/vmm/v4.0.a1/ahv/config/vms"
 "/api/vmm/v4.0.b1/ahv/config/vms"
 "/api/clustermgmt/v4.0.b2/config/storage-containers"
+"/api/prism/v4.0/config/tasks"
+"/api/volumes/v4.0/config/volume-groups/"
+"/api/prism/v4.0/config/categories"
+"/api/dataprotection/v4.0/config/recovery-points"
+"/api/clustermgmt/v4.0/config/clusters"
+"/api/clustermgmt/v4.0/config/storage-containers"
+"/api/networking/v4.0/config/subnets"
+"/api/vmm/v4.0/content/images"
+"/api/vmm/v4.0/ahv/config/vms"
+"/api/clustermgmt/v4.0.b2/config/clusters" 
+"/api/dataprotection/v4.0.b1/config/recovery-points"
+"/api/files/v4.0/config/file-servers"
 }}
 
 # POST url
@@ -25,24 +37,35 @@
 "/api/dataprotection/v4.0.a3/config/recovery-points"
 "/api/vmm/v4.0.a1/ahv/config/vms"
 "/api/vmm/v4.0.a1/images"
+"/api/volumes/v4.0/config/volume-groups"
+"/api/prism/v4.0/config/categories"
+"/api/dataprotection/v4.0/config/recovery-points"
+"/api/vmm/v4.0/ahv/config/vms"
+"/api/vmm/v4.0/content/images"
+"/api/dataprotection/v4.0.b1/config/recovery-points"
+"/api/files/v4.0/config/file-servers"
 }}
 
 # PUT url
 {{ $PUTendpoints := list
-"/api/vmm/v4.0.a1/ahv/config/vms"
+"/api/vmm/v4.0/ahv/config/vms"
+"/api/files/v4.0/config/file-servers"
 }}
 
 # PATCH url
 {{ $PATCHendpoints := list
 "/api/storage/v4.0.a3/config/volume-groups"
 "/api/volumes/v4.0.b1/config/volume-groups"
+"/api/volumes/v4.0/config/volume-groups"
 }}
 
 # DELETE url
 {{ $DELETEendpoints := list
-"/api/storage/v4.0.a3/config/volume-groups"
-"/api/vmm/v4.0.a1/ahv/config/vms"
-"/api/vmm/v4.0.a1/images"
+"/api/volumes/v4.0/config/volume-groups"
+"/api/vmm/v4.0/ahv/config/vms"
+"/api/vmm/v4.0/content/images"
+"/api/volumes/v4.0.b1/config/volume-groups"
+"/api/files/v4.0.b1/config/file-servers"
 }}
 
 {{define "route"}}