viktor/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix k8s upgrade issues [ci skip]

Browse source
This commit is contained in:
viktorbarzin 2022-01-06 00:07:48 +00:00
parent d22366eedb
commit 6870cee492
No known key found for this signature in database
GPG key ID: 0EB088298288D958
22 changed files with 242 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/create-vm/versions.tf Normal file
View file

@ -0,0 +1,9 @@
terraform {
required_providers {
vsphere = {
source = "hashicorp/vsphere"
version = "2.0.2"
}
}
}

18
modules/kubernetes/blog/main.tf
View file

@ -103,7 +103,7 @@ resource "kubernetes_service" "blog" {
}
}
resource "kubernetes_ingress" "blog" {
resource "kubernetes_ingress_v1" "blog" {
metadata {
name = "blog-ingress"
namespace = "website"
@ -123,8 +123,12 @@ resource "kubernetes_ingress" "blog" {
path {
path = "/"
backend {
service_name = "blog"
service_port = "80"
service {
name = "blog"
port {
number = 80
}
}
}
}
}
@ -135,8 +139,12 @@ resource "kubernetes_ingress" "blog" {
path {
path = "/"
backend {
service_name = "blog"
service_port = "80"
service {
name = "blog"
port {
number = 80
}
}
}
}
}

12
modules/kubernetes/city-guesser/main.tf
View file

@ -104,7 +104,7 @@ resource "kubernetes_service" "city-guesser" {
# }
# }
resource "kubernetes_ingress" "city-guesser" {
resource "kubernetes_ingress_v1" "city-guesser" {
metadata {
name = "city-guesser-ingress"
namespace = "city-guesser"
@ -127,8 +127,12 @@ resource "kubernetes_ingress" "city-guesser" {
path {
path = "/"
backend {
service_name = "city-guesser"
service_port = "80"
service {
name = "city-guesser"
port {
number = 80
}
}
}
}
}
@ -136,7 +140,7 @@ resource "kubernetes_ingress" "city-guesser" {
}
}
# resource "kubernetes_ingress" "city-guesser-oauth" {
# resource "kubernetes_ingress_v1" "city-guesser-oauth" {
# metadata {
# name = "city-guesser-ingress-oauth"
# namespace = "city-guesser"

20
modules/kubernetes/dbaas/main.tf
View file

@ -103,7 +103,7 @@ resource "kubernetes_secret" "cluster-password" {
}
}
resource "kubernetes_ingress" "dbaas" {
resource "kubernetes_ingress_v1" "dbaas" {
metadata {
name = "orchestrator-ingress"
namespace = "dbaas"
@ -125,8 +125,12 @@ resource "kubernetes_ingress" "dbaas" {
path {
path = "/"
backend {
service_name = "mysql-mysql-operator"
service_port = "80"
service {
name = "mysql-mysql-operator"
port {
number = 80
}
}
}
}
}
@ -207,7 +211,7 @@ resource "kubernetes_service" "phpmyadmin" {
}
}
resource "kubernetes_ingress" "phpmyadmin" {
resource "kubernetes_ingress_v1" "phpmyadmin" {
metadata {
name = "phpmyadmin-ingress"
namespace = "dbaas"
@ -229,8 +233,12 @@ resource "kubernetes_ingress" "phpmyadmin" {
path {
path = "/"
backend {
service_name = "phpmyadmin"
service_port = "80"
service {
name = "phpmyadmin"
port {
number = 80
}
}
}
}
}

10
modules/kubernetes/drone/main.tf
View file

@ -146,7 +146,7 @@ resource "kubernetes_service" "drone" {
}
}
resource "kubernetes_ingress" "drone" {
resource "kubernetes_ingress_v1" "drone" {
metadata {
name = "drone-ingress"
namespace = "drone"
@ -168,8 +168,12 @@ resource "kubernetes_ingress" "drone" {
path {
path = "/"
backend {
service_name = "drone"
service_port = "80"
service {
name = "drone"
port {
number = 80
}
}
}
}
}

10
modules/kubernetes/f1-stream/main.tf
View file

@ -77,7 +77,7 @@ module "tls_secret" {
}
resource "kubernetes_ingress" "f1-stream" {
resource "kubernetes_ingress_v1" "f1-stream" {
metadata {
name = "f1-ingress"
namespace = "f1-stream"
@ -100,8 +100,12 @@ resource "kubernetes_ingress" "f1-stream" {
path {
path = "/"
backend {
service_name = "f1-stream"
service_port = "80"
service {
name = "f1-stream"
port {
number = 80
}
}
}
}
}

10
modules/kubernetes/hackmd/main.tf
View file

@ -137,7 +137,7 @@ resource "kubernetes_service" "hackmd" {
}
}
resource "kubernetes_ingress" "hackmd" {
resource "kubernetes_ingress_v1" "hackmd" {
metadata {
name = "hackmd-ingress"
namespace = "hackmd"
@ -157,8 +157,12 @@ resource "kubernetes_ingress" "hackmd" {
path {
path = "/"
backend {
service_name = "hackmd"
service_port = "80"
service {
name = "hackmd"
port {
number = 80
}
}
}
}
}

18
modules/kubernetes/k8s-dashboard/main.tf
View file

@ -10,12 +10,12 @@ resource "random_password" "csrf_token" {
module "dashboard" {
# source = "cookielab/dashboard/kubernetes"
source = "ViktorBarzin/dashboard/kubernetes"
version = "0.13.1"
version = "0.13.2"
kubernetes_dashboard_csrf = random_password.csrf_token.result
kubernetes_dashboard_deployment_args = list(
kubernetes_dashboard_deployment_args = tolist([
"--auto-generate-certificates",
"--token-ttl=0"
)
])
}
module "tls_secret" {
@ -41,7 +41,7 @@ module "tls_secret" {
# depends_on = [kubernetes_namespace.kubernetes-dashboard]
# }
resource "kubernetes_ingress" "kubernetes-dashboard" {
resource "kubernetes_ingress_v1" "kubernetes-dashboard" {
metadata {
name = "kubernetes-dashboard"
namespace = "kubernetes-dashboard"
@ -68,8 +68,12 @@ resource "kubernetes_ingress" "kubernetes-dashboard" {
path {
path = "/"
backend {
service_name = "kubernetes-dashboard"
service_port = "443"
service {
name = "kubernetes-dashboard"
port {
number = 443
}
}
}
}
}
@ -96,7 +100,7 @@ resource "kubernetes_cluster_role_binding" "kubernetes-dashboard" {
depends_on = [module.dashboard]
}
# resource "kubernetes_ingress" "oauth" {
# resource "kubernetes_ingress_v1" "oauth" {
# metadata {
# name = "kubernetes-dashboard"
# namespace = "oauth"

10
modules/kubernetes/kafka/main.tf
View file

@ -105,7 +105,7 @@ resource "kubernetes_service" "kafka-ui" {
}
}
resource "kubernetes_ingress" "kafka-ui" {
resource "kubernetes_ingress_v1" "kafka-ui" {
metadata {
name = "kafka-ui-ingress"
namespace = "kafka"
@ -128,8 +128,12 @@ resource "kubernetes_ingress" "kafka-ui" {
path {
path = "/"
backend {
service_name = "kafka-ui"
service_port = "80"
service {
name = "kafka-ui"
port {
number = 80
}
}
}
}
}

10
modules/kubernetes/kms/main.tf
View file

@ -106,7 +106,7 @@ resource "kubernetes_service" "kms-web-page" {
}
}
resource "kubernetes_ingress" "kms-web-page" {
resource "kubernetes_ingress_v1" "kms-web-page" {
metadata {
name = "kms-web-page"
namespace = "kms"
@ -126,8 +126,12 @@ resource "kubernetes_ingress" "kms-web-page" {
path {
path = "/"
backend {
service_name = "kms-web-page"
service_port = "80"
service {
name = "kms-web-page"
port {
number = 80
}
}
}
}
}

20
modules/kubernetes/monitoring/main.tf
View file

@ -182,7 +182,7 @@ resource "kubernetes_cron_job" "monitor_prom" {
}
}
resource "kubernetes_ingress" "status" {
resource "kubernetes_ingress_v1" "status" {
metadata {
name = "hetrix-redirect-ingress"
namespace = "monitoring"
@ -203,8 +203,12 @@ resource "kubernetes_ingress" "status" {
path {
path = "/"
backend {
service_name = "not-used" # redirected by annotation
service_port = "80"
service {
name = "not-used"
port {
number = 80 # redirected by annotation
}
}
}
}
}
@ -212,7 +216,7 @@ resource "kubernetes_ingress" "status" {
}
}
resource "kubernetes_ingress" "status_yotovski" {
resource "kubernetes_ingress_v1" "status_yotovski" {
metadata {
name = "hetrix-yotovski-redirect-ingress"
namespace = "monitoring"
@ -233,8 +237,12 @@ resource "kubernetes_ingress" "status_yotovski" {
path {
path = "/"
backend {
service_name = "not-used" # redirected by annotation
service_port = "80"
service {
name = "not-used" # redirected by annotation
port {
number = 80
}
}
}
}
}

10
modules/kubernetes/oauth-proxy/main.tf
View file

@ -98,7 +98,7 @@ resource "kubernetes_service" "oauth_proxy" {
}
}
resource "kubernetes_ingress" "oauth" {
resource "kubernetes_ingress_v1" "oauth" {
metadata {
name = "oauth-ingress"
namespace = var.namespace
@ -119,8 +119,12 @@ resource "kubernetes_ingress" "oauth" {
path {
path = "/oauth2/.*"
backend {
service_name = var.svc_name
service_port = "80"
service {
name = var.svc_name
port {
number = 80
}
}
}
}
}

10
modules/kubernetes/openid_help_page/main.tf
View file

@ -78,7 +78,7 @@ resource "kubernetes_service" "openid_help_page" {
}
}
resource "kubernetes_ingress" "openid_help_page" {
resource "kubernetes_ingress_v1" "openid_help_page" {
metadata {
name = "openid-help-page"
namespace = "openid-help-page"
@ -98,8 +98,12 @@ resource "kubernetes_ingress" "openid_help_page" {
path {
path = "/"
backend {
service_name = "openid-help-page"
service_port = "80"
service {
name = "openid-help-page"
port {
number = 80
}
}
}
}
}

10
modules/kubernetes/pihole/main.tf
View file

@ -164,7 +164,7 @@ resource "kubernetes_service" "pihole-web" {
}
}
resource "kubernetes_ingress" "pihole" {
resource "kubernetes_ingress_v1" "pihole" {
metadata {
name = "pihole-ingress"
namespace = "pihole"
@ -186,8 +186,12 @@ resource "kubernetes_ingress" "pihole" {
path {
path = "/"
backend {
service_name = "pihole-web"
service_port = "80"
service {
name = "pihole-web"
port {
number = 80
}
}
}
}
}

18
modules/kubernetes/privatebin/main.tf
View file

@ -98,7 +98,7 @@ resource "kubernetes_service" "privatebin" {
}
}
resource "kubernetes_ingress" "privatebin" {
resource "kubernetes_ingress_v1" "privatebin" {
metadata {
name = "privatebin-ingress"
namespace = "privatebin"
@ -118,8 +118,12 @@ resource "kubernetes_ingress" "privatebin" {
path {
path = "/"
backend {
service_name = "privatebin"
service_port = "80"
service {
name = "privatebin"
port {
number = 80
}
}
}
}
}
@ -130,8 +134,12 @@ resource "kubernetes_ingress" "privatebin" {
path {
path = "/"
backend {
service_name = "privatebin"
service_port = "80"
service {
name = "privatebin"
port {
number = 80
}
}
}
}
}

2
modules/kubernetes/reverse-proxy/main.tf
View file

@ -41,7 +41,7 @@ resource "kubernetes_service" "openwrt" {
# port: 443
# protocol: TCP
resource "kubernetes_ingress" "openwrt" {
resource "kubernetes_ingress_v1" "openwrt" {
metadata {
name = "openwrt-ingress"
namespace = "website"

30
modules/kubernetes/url-shortener/main.tf
View file

@ -164,7 +164,7 @@ resource "kubernetes_service" "shlink" {
}
}
resource "kubernetes_ingress" "shlink" {
resource "kubernetes_ingress_v1" "shlink" {
metadata {
name = "shlink-ingress"
namespace = "url"
@ -190,8 +190,12 @@ resource "kubernetes_ingress" "shlink" {
path {
path = "/"
backend {
service_name = "shlink"
service_port = "80"
service {
name = "shlink"
port {
number = 80
}
}
}
}
}
@ -299,7 +303,7 @@ resource "kubernetes_service" "shlink-web" {
}
}
resource "kubernetes_ingress" "shlink-web" {
resource "kubernetes_ingress_v1" "shlink-web" {
metadata {
name = "shlink-web-ingress"
namespace = "url"
@ -321,8 +325,12 @@ resource "kubernetes_ingress" "shlink-web" {
path {
path = "/"
backend {
service_name = "shlink-web"
service_port = "80"
service {
name = "shlink-web"
port {
number = 80
}
}
}
}
}
@ -382,7 +390,7 @@ resource "kubernetes_service" "shlink2" {
}
}
resource "kubernetes_ingress" "shlink2" {
resource "kubernetes_ingress_v1" "shlink2" {
metadata {
name = "shlink-ingress2"
namespace = "url"
@ -412,8 +420,12 @@ resource "kubernetes_ingress" "shlink2" {
path {
path = "/"
backend {
service_name = "shlink2"
service_port = "80"
service {
name = "shlink2"
port {
number = 80
}
}
}
}
}

4
modules/kubernetes/versions.tf
View file

@ -1,8 +1,8 @@
terraform {
required_providers {
kubernetes = {
source = "hashicorp/kubernetes"
source = "hashicorp/kubernetes"
version = ">= 2.7.1"
}
}
required_version = ">= 0.13"
}

10
modules/kubernetes/webhook_handler/main.tf
View file

@ -187,7 +187,7 @@ resource "kubernetes_service" "webhook_handler" {
}
}
resource "kubernetes_ingress" "webhook_handler" {
resource "kubernetes_ingress_v1" "webhook_handler" {
metadata {
name = "webhook-handler-ingress"
namespace = "webhook-handler"
@ -207,8 +207,12 @@ resource "kubernetes_ingress" "webhook_handler" {
path {
path = "/"
backend {
service_name = "webhook-handler"
service_port = "80"
service {
name = "webhook-handler"
port {
number = 80
}
}
}
}
}

10
modules/kubernetes/wireguard/main.tf
View file

@ -350,7 +350,7 @@ resource "kubernetes_service" "webui" {
}
resource "kubernetes_ingress" "webui" {
resource "kubernetes_ingress_v1" "webui" {
metadata {
name = "webui-ingress"
namespace = "wireguard"
@ -370,8 +370,12 @@ resource "kubernetes_ingress" "webui" {
path {
path = "/"
backend {
service_name = "webui"
service_port = "80"
service {
name = "webui"
port {
number = 80
}
}
}
}
}