can create new entries with random password not erased after new excution

external_manifests/django/django-db.secret.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-data:
-  DB_DATABASE_NAME: ZGphbmdv
-  DB_HOST: ZGphbmdvLWRiLXN2Yw==
-  DB_PASSWORD: U3VmZnJhZ2UtTW9uZXliYWdzLUlsbHVzaW9uNw==
-  DB_USERNAME: ZGphbmdvX3VzZXJuYW1l
-kind: Secret
-metadata:
-  creationTimestamp: null
-  name: django-db-credentials
-  namespace: django

external_manifests/immich/immich-db.secret.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-data:
-  DB_DATABASE_NAME: aW1taWNo
-  DB_HOST: aW1taWNodC1kYi1zdmM=
-  DB_PASSWORD: U3Bvb24tQm9yb3VnaC1CYXNpczg=
-  DB_USERNAME: aW1taWNoX3VzZXJuYW1l
-kind: Secret
-metadata:
-  creationTimestamp: null
-  name: immich-db-credentials
-  namespace: immicht

external_manifests/stash/download.sh

@@ -35,8 +35,8 @@ PROXY_HTTP="http://gluetun-svc.gluetun.svc:8888"
 #BASE_URL="https://www.pornpics.com/pornstars/eiby-shine/"
 #pornstars="eiby-shine"
 
-#BASE_URL="https://www.pornpics.com/pornstars/chloe-camilla/"
+BASE_URL="https://www.pornpics.com/?q=shy+imp"
-#pornstars="chloe-camilla"
+pornstars="shy-imp"
 
 #BASE_URL="https://www.pornpics.com/pornstars/becky-summer"
 #pornstars="becky-summer"
@@ -44,9 +44,6 @@ PROXY_HTTP="http://gluetun-svc.gluetun.svc:8888"
 
 #clear files beforehand
 
-echo "Pornstar: "$pornstars
-echo "URL: "$BASE_URL
-
 
 mkdir -p $DESTINATION_FOLDER/$pornstars
 
@@ -66,7 +63,7 @@ echo "" > $DESTINATION_FOLDER/$pornstars-image_to_download.txt
 
 
 for f in $(cat $DESTINATION_FOLDER/$pornstars-urls_of_galleries.txt ); do
-	$curl_command $f | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | grep "https://cdni.pornpics.com/" >> $DESTINATION_FOLDER/$pornstars-image_to_download.txt
+	$curl_command $f | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*" | grep "https://cdni.pornpics.com/1280" >> $DESTINATION_FOLDER/$pornstars-image_to_download.txt
 	echo $f
 done
 
@@ -76,3 +73,4 @@ for g in $(cat $DESTINATION_FOLDER/$pornstars-image_to_download.txt ); do
 #        wget -e use_proxy=yes -e http_proxy=$PROXY_HTTP $g -P $DESTINATION_FOLDER/$pornstars
         echo $g 
 done
+exit 0

external_manifests/stash/stash-pornpics-dowloader.configmap.yml

@@ -6,24 +6,25 @@ data:
     \"$v\"=\"$2\"\n        shift\n    fi\n    shift\ndone\n\n#check if we will use
     a HTTP proxy or not\n\nif [[ -z $http_proxy ]]; then\n        echo \"not using
     proxy\"\n        curl_command=\"curl\"\nelse\n        echo \"using proxy\"\n        curl_command=\"curl
-    -x $http_proxy\"\n\nfi\n\n\n#dowload from https://www.pornpics.com/pornstars/eiby-shine/\nDESTINATION_FOLDER=\"/data\"\nPROXY_HTTP=\"http://gluetun-svc.gluetun.svc:8888\"\n\n#BASE_URL=\"https://www.pornpics.com/pornstars/eiby-shine/\"\n#pornstars=\"eiby-shine\"\n\n#BASE_URL=\"https://www.pornpics.com/pornstars/chloe-camilla/\"\n#pornstars=\"chloe-camilla\"\n\n#BASE_URL=\"https://www.pornpics.com/pornstars/becky-summer\"\n#pornstars=\"becky-summer\"\n\n\n#clear
+    -x $http_proxy\"\n\nfi\n\n\n#dowload from https://www.pornpics.com/pornstars/eiby-shine/\nDESTINATION_FOLDER=\"/data\"\nPROXY_HTTP=\"http://gluetun-svc.gluetun.svc:8888\"\n\n#BASE_URL=\"https://www.pornpics.com/pornstars/eiby-shine/\"\n#pornstars=\"eiby-shine\"\n\nBASE_URL=\"https://www.pornpics.com/?q=shy+imp\"\npornstars=\"shy-imp\"\n\n#BASE_URL=\"https://www.pornpics.com/pornstars/becky-summer\"\n#pornstars=\"becky-summer\"\n\n\n#clear
-    files beforehand\n\necho \"Pornstar: \"$pornstars\necho \"URL: \"$BASE_URL\n\n\nmkdir
+    files beforehand\n\n\nmkdir -p $DESTINATION_FOLDER/$pornstars\n\nif [[ $skip_searching_gallery
-    -p $DESTINATION_FOLDER/$pornstars\n\nif [[ $skip_searching_gallery == true ]];
+    == true ]]; then\n        echo \"not looping through galleries\"\n\t\techo \"using
-    then\n        echo \"not looping through galleries\"\n\t\techo \"using existing
+    existing file instead\"\n\t\t#because we need to keep the file $DESTINATION_FOLDER/$pornstars-urls_of_galleries.txt
-    file instead\"\n\t\t#because we need to keep the file $DESTINATION_FOLDER/$pornstars-urls_of_galleries.txt
+    with the existing URL , in this condition, \n\t\t#no deletion of this file\necho
-    with the existing URL , in this condition, \n\t\t#no deletion of this file\nelse\n
+    \"https://www.pornpics.com/galleries/onlyfans-shy-imp-starring-shy-imp-naked-porn-pics-90263490/\nhttps://www.pornpics.com/galleries/onlyfans-shy-imp-featuring-shy-imp-xxx-porn-pics-15741579/\nhttps://www.pornpics.com/galleries/onlyfans-shy-imp-starring-shy-imp-naked-photos-68925414/\nhttps://www.pornpics.com/galleries/onlyfans-shy-imp-shy-imp-20862921/\nhttps://www.pornpics.com/galleries/skinny-girl-with-pink-hair-shy-imp-shows-her-small-tits-during-a-solo-show-50988369/\nhttps://www.pornpics.com/galleries/onlyfans-shy-imp-featuring-shy-imp-hot-gallery-86312934/\"
-    \       echo \"looping through galleries\"\n\t\t#because we will re-generate this
+    >> $DESTINATION_FOLDER/$pornstars-urls_of_galleries.txt\n\nelse\n        echo
-    file, can be emptied\n\t\techo \"\" > $DESTINATION_FOLDER/$pornstars-urls_of_galleries.txt\n
+    \"looping through galleries\"\n\t\t#because we will re-generate this file, can
+    be emptied\n\t\techo \"\" > $DESTINATION_FOLDER/$pornstars-urls_of_galleries.txt\n
     \       $curl_command -s $BASE_URL |  grep -Eo \"(http|https)://[a-zA-Z0-9./?=_%:-]*\"
     | grep \"https://www.pornpics.com/galleries/\" |sort -u >> $DESTINATION_FOLDER/$pornstars-urls_of_galleries.txt\nfi\n\necho
     \"\" > $DESTINATION_FOLDER/$pornstars-image_to_download.txt\n\n\nfor f in $(cat
     $DESTINATION_FOLDER/$pornstars-urls_of_galleries.txt ); do\n\t$curl_command $f
-    | grep -Eo \"(http|https)://[a-zA-Z0-9./?=_%:-]*\" | grep \"https://cdni.pornpics.com/\"
+    | grep -Eo \"(http|https)://[a-zA-Z0-9./?=_%:-]*\" | grep \"https://cdni.pornpics.com/1280\"
     >> $DESTINATION_FOLDER/$pornstars-image_to_download.txt\n\techo $f\ndone\n\n\nfor
     g in $(cat $DESTINATION_FOLDER/$pornstars-image_to_download.txt ); do \n\t$curl_command
     -O --output-dir $DESTINATION_FOLDER/$pornstars $g\n#        wget -e use_proxy=yes
     -e http_proxy=$PROXY_HTTP $g -P $DESTINATION_FOLDER/$pornstars\n        echo $g
-    \ndone\n"
+    \ndone\nexit 0\n"
 kind: ConfigMap
 metadata:
   creationTimestamp: null

external_manifests/stash/stash-pornpics-dowloader.job.yml

@@ -17,17 +17,13 @@ spec:
           mountPropagation: None
           name: data-pvc
         command:
+#          - /bin/bash
+#          - -c
+#          - sleep 3600
           - bash
-          - -c
-          - sleep 3600
-#          - bash
           - /config/download.sh 
           - --http_proxy 
           - "http://gluetun-svc.gluetun.svc:8888"
-          - --BASE_URL 
-          - "https://www.pornpics.com/?q=bretona"
-          - --pornstars
-          - "bretona"
       restartPolicy: Never
       volumes:
       - configMap:

module.tf

@@ -1,11 +1,59 @@
 terraform {
   required_version = "> 0.8.0"
+  required_providers {
+    bitwarden = {
+      source  = "maxlaverse/bitwarden"
+      version = ">= 0.13.6"
+    }
+  }
 }
 
 provider "kubernetes" {
   config_path = "~/.kube/config"
 }
 
+provider "bitwarden" {
+  email           = "pierre@geeraert.eu"
+  master_password = ""
+  server          = "https://bitwarden.tryton.geeraert.eu"
+  experimental {
+    embedded_client = true
+  }
+}
+#https://stackoverflow.com/questions/66670949/how-to-tell-terraform-to-skip-the-secret-manager-resource-if-it-exists
+#for the secret not overwritten (not tested)
+data "bitwarden_item_login" "example" {
+  search = "bookstack.zeus.geeraert.eu"
+}
+
+data "bitwarden_item_secure_note" "vpn_preshared_key" {
+  search = "terraform testing"
+}
+output "pgpin" {
+  value     = nonsensitive(coalesce(data.bitwarden_item_secure_note.vpn_preshared_key.field.1.hidden,1234))
+  sensitive = true
+}
+
+resource "random_password" "password" {
+  length           = 16
+  special          = true
+  override_special = "!#$%&*()-_=+[]{}<>:?"
+}
+
+resource "bitwarden_item_secure_note" "terraform_upload_testing" {
+  name            = "terraform upload testing"
+#  notes           = <<EOT
+#[global]
+#secret = "<something sensitive>"
+#EOT
+  organization_id = "a6361589-badd-4bde-9cb4-af8901161c0d"
+  collection_ids  = ["3fa902cd-8244-46bc-a4ea-af8901262d94"]
+
+  field {
+    name = "category"
+    hidden = random_password.password.result
+  }
+}
 
 variable "kubernetes" {
   type = map(object({
@@ -15,14 +63,10 @@ variable "kubernetes" {
       name               = string
       pvc                = optional(bool, false)
       config_map         = optional(bool, false)
-      secret               = optional(bool, false)
       host_path          = optional(string)
       pvc_size           = optional(string)
       storage_class_name = optional(string, "nfs-storage-intelligent")
-      annotations_fileType = optional(string)
-      existing_pvc         = optional(bool, false)
       mount_path         = string
-      sub_path 		   = optional(string)
     })))
     environment = optional(map(object({
       name  = optional(string)
@@ -37,11 +81,11 @@ variable "kubernetes" {
     replicas            = optional(number, 1)
     namespace           = optional(string)
     connected_namespace = optional(string, "")
-    command                = optional(list(string))
+    #    namespace           = optional(string,coalesce(connected_namespace,""))
+    #block_namespace_creation = optional(bool, false)
     service_port           = optional(list(number))
     service_type           = optional(string, "ClusterIP")
     service_name           = optional(string)
-    domain_name            = optional(string)
     liveness_tcp_socket    = optional(number)
     liveness_http_get      = optional(string)
     liveness_http_get_path = optional(string)
@@ -66,36 +110,18 @@ variable "kubernetes" {
 }
 
 locals {
-  pvc_list = flatten([
+  pvc_details = flatten([
     for key, value in var.kubernetes : [
       for index, pvc in value.pvc : {
-        key                  = "${coalesce(value.namespace, value.connected_namespace, key)}/${pvc.name}"
         index              = index
         pvc                = pvc.pvc
         name               = pvc.name
         pvc_size           = pvc.pvc_size
         mount_path         = pvc.mount_path
         storage_class_name = pvc.storage_class_name
-        annotations_fileType = pvc.annotations_fileType
-        existing_pvc         = pvc.existing_pvc
-        sub_path             = pvc.sub_path
         namespace          = coalesce(value.namespace, value.connected_namespace, key)
     }] if value.enabled == true && value.pvc != null
   ])
-  
- # group duplicates instead of throwing an error
-  pvc_map_grouped = {
-    for p in local.pvc_list :
-    p.key => p...
-  }
-
-  # keep only one PVC per key (take the first)
-  pvc_map = {
-    for k, list in local.pvc_map_grouped :
-    k => list[0]
-  }
-
-  pvc_details = values(local.pvc_map)
 }
 
 locals {
@@ -150,19 +176,14 @@ resource "kubernetes_manifest" "manifest" {
 
 
 resource "kubernetes_persistent_volume_claim" "automatic-pvc" {
-  for_each = { for key, value in local.pvc_details : "${value.index}" => merge(value, { mew_key = value.index }) if value.pvc && value.existing_pvc != true }
+  for_each = { for key, value in local.pvc_details : "${value.index}" => merge(value, { mew_key = value.index }) if value.pvc }
   metadata {
     namespace = coalesce(each.value.namespace, each.key)
     name      = "${each.value.name}-pvc"
     labels = {
       deployment_method = "Terraform"
     }
-    annotations = {
-      fileType = try(each.value.annotations_fileType, "file")
   }
-
-  }
-
   spec {
     access_modes       = ["ReadWriteMany"]
     storage_class_name = each.value.storage_class_name
@@ -349,7 +370,6 @@ resource "kubernetes_deployment_v1" "automatic" {
             content {
               mount_path = volume_mount.value.mount_path
               name       = "${volume_mount.value.name}-pvc"
-              sub_path = volume_mount.value.sub_path != null ? volume_mount.value.sub_path : ""
             }
           }
 
@@ -377,20 +397,6 @@ resource "kubernetes_deployment_v1" "automatic" {
             }
           }
 
-          #        dynamic "command" {
-          #          for_each = each.value.command != null ? [1] : []
-          #          content {
-          #            [each.value.command]
-          #          }
-
-          #        }
-          #    command = each.value.command != null ? {
-          #      [each.value.command]
-          #    } : {}
-
-
-          command = each.value.command != null ? each.value.command : []
-
 
           dynamic "env" {
             for_each = each.value.environment != null ? each.value.environment : {}
@@ -505,12 +511,6 @@ resource "kubernetes_deployment_v1" "automatic" {
               }
             }
 
-            dynamic "secret" {
-              for_each = volume.value.secret ? [1] : []
-              content {
-                secret_name = volume.value.name
-              }
-            }
 
           }
         }
@@ -570,8 +570,9 @@ resource "kubernetes_deployment_v1" "database-automatic" {
             name       = "${each.key}-db-pvc"
           }
 
-          command = try([each.value.database.command],[])
+
-          #command = [try(each.value.database.command,"")]
+
+
 
           dynamic "env" {
             for_each = each.value.environment != null ? each.value.environment : {}
@@ -769,22 +770,3 @@ resource "kubernetes_deployment_v1" "redis-automatic" {
     }
   }
 }
-
-resource "kubernetes_config_map" "automatic-configmap" {
-  metadata {
-    name      = "extra-sites-terraform"
-    namespace = "reverse-proxy"
-    annotations = {
-      "reloader.stakater.com/match" : "true",
-    }
-  }
-
-  data = {
-    for key, value in var.kubernetes :
-    "${value.domain_name}.conf" => templatefile("nginx_config.tftpl", {
-      name_site    = value.domain_name
-      name_service = "${key}-svc.${coalesce(value.namespace, value.connected_namespace, key)}.svc:${value.service_port.0}"
-    }) if value.domain_name != null && value.enabled == true
-  }
-
-}