fix
This commit is contained in:
@@ -33,7 +33,7 @@ resource "kubectl_manifest" "collabora_deploy" {
|
||||
containers:
|
||||
- name: collabora
|
||||
image: "${var.images.collabora.registry}/${var.images.collabora.repository}:${var.images.collabora.tag}"
|
||||
imagePullPolicy: "${var.images.collabora.pullPolicy}"
|
||||
imagePullPolicy: "${var.images.collabora.pull_policy}"
|
||||
env:
|
||||
- name: aliasgroup1
|
||||
value: "https://${local.dns_name}"
|
||||
|
||||
@@ -75,7 +75,7 @@ data "kustomization_overlay" "data" {
|
||||
containers:
|
||||
- name: nextcloud
|
||||
image: "${var.images.nextcloud.registry}/${var.images.nextcloud.repository}:${var.images.nextcloud.tag}"
|
||||
imagePullPolicy: "${var.images.nextcloud.pullPolicy}"
|
||||
imagePullPolicy: "${var.images.nextcloud.pull_policy}"
|
||||
command: ["/usr/local/bin/wrapper"]
|
||||
args: ["php-fpm"]
|
||||
env:
|
||||
@@ -138,7 +138,7 @@ data "kustomization_overlay" "data" {
|
||||
subPath: "wrapper"
|
||||
- name: nextcloud-nginx
|
||||
image: "${var.images.nginx.registry}/${var.images.nginx.repository}:${var.images.nginx.tag}"
|
||||
imagePullPolicy: "${var.images.nginx.pullPolicy}"
|
||||
imagePullPolicy: "${var.images.nginx.pull_policy}"
|
||||
resources:
|
||||
{}
|
||||
readinessProbe:
|
||||
@@ -171,7 +171,7 @@ data "kustomization_overlay" "data" {
|
||||
containers:
|
||||
- name: metrics-exporter
|
||||
image: "${var.images.exporter.registry}/${var.images.exporter.repository}:${var.images.exporter.tag}"
|
||||
imagePullPolicy: "${var.images.exporter.pullPolicy}"
|
||||
imagePullPolicy: "${var.images.exporter.pull_policy}"
|
||||
env:
|
||||
- name: NEXTCLOUD_SERVER
|
||||
value: "https://${local.dns_name}"
|
||||
|
||||
@@ -284,27 +284,27 @@ options:
|
||||
images:
|
||||
default:
|
||||
collabora:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: collabora/code
|
||||
tag: 23.05.5.2.1
|
||||
exporter:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: xperimental/nextcloud-exporter
|
||||
tag: 0.6.2
|
||||
nextcloud:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: nextcloud
|
||||
tag: 27.1.2-fpm
|
||||
nginx:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: nginx
|
||||
tag: alpine
|
||||
onlyoffice:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: onlyoffice/documentserver
|
||||
tag: 7.5.0.1
|
||||
@@ -313,38 +313,38 @@ options:
|
||||
repository: cloudnative-pg/postgresql
|
||||
tag: 15.3
|
||||
redis:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: quay.io
|
||||
repository: opstree/redis
|
||||
tag: v7.0.12
|
||||
redis_exporter:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: quay.io
|
||||
repository: opstree/redis-exporter
|
||||
tag: v1.44.0
|
||||
examples:
|
||||
- collabora:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: collabora/code
|
||||
tag: 23.05.5.2.1
|
||||
exporter:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: xperimental/nextcloud-exporter
|
||||
tag: 0.6.2
|
||||
nextcloud:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: nextcloud
|
||||
tag: 27.1.2-fpm
|
||||
nginx:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: nginx
|
||||
tag: alpine
|
||||
onlyoffice:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: onlyoffice/documentserver
|
||||
tag: 7.5.0.1
|
||||
@@ -353,24 +353,24 @@ options:
|
||||
repository: cloudnative-pg/postgresql
|
||||
tag: 15.3
|
||||
redis:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: quay.io
|
||||
repository: opstree/redis
|
||||
tag: v7.0.12
|
||||
redis_exporter:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: quay.io
|
||||
repository: opstree/redis-exporter
|
||||
tag: v1.44.0
|
||||
properties:
|
||||
collabora:
|
||||
default:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: collabora/code
|
||||
tag: 23.05.5.2.1
|
||||
properties:
|
||||
pullPolicy:
|
||||
pull_policy:
|
||||
default: IfNotPresent
|
||||
type: string
|
||||
registry:
|
||||
@@ -385,12 +385,12 @@ options:
|
||||
type: object
|
||||
exporter:
|
||||
default:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: xperimental/nextcloud-exporter
|
||||
tag: 0.6.2
|
||||
properties:
|
||||
pullPolicy:
|
||||
pull_policy:
|
||||
default: IfNotPresent
|
||||
type: string
|
||||
registry:
|
||||
@@ -405,12 +405,12 @@ options:
|
||||
type: object
|
||||
nextcloud:
|
||||
default:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: nextcloud
|
||||
tag: 27.1.2-fpm
|
||||
properties:
|
||||
pullPolicy:
|
||||
pull_policy:
|
||||
default: IfNotPresent
|
||||
enum:
|
||||
- Always
|
||||
@@ -429,12 +429,12 @@ options:
|
||||
type: object
|
||||
nginx:
|
||||
default:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: nginx
|
||||
tag: alpine
|
||||
properties:
|
||||
pullPolicy:
|
||||
pull_policy:
|
||||
default: IfNotPresent
|
||||
enum:
|
||||
- Always
|
||||
@@ -453,12 +453,12 @@ options:
|
||||
type: object
|
||||
onlyoffice:
|
||||
default:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: onlyoffice/documentserver
|
||||
tag: 7.5.0.1
|
||||
properties:
|
||||
pullPolicy:
|
||||
pull_policy:
|
||||
default: IfNotPresent
|
||||
type: string
|
||||
registry:
|
||||
@@ -489,12 +489,12 @@ options:
|
||||
type: object
|
||||
redis:
|
||||
default:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: quay.io
|
||||
repository: opstree/redis
|
||||
tag: v7.0.12
|
||||
properties:
|
||||
pullPolicy:
|
||||
pull_policy:
|
||||
default: IfNotPresent
|
||||
enum:
|
||||
- Always
|
||||
@@ -513,12 +513,12 @@ options:
|
||||
type: object
|
||||
redis_exporter:
|
||||
default:
|
||||
pullPolicy: IfNotPresent
|
||||
pull_policy: IfNotPresent
|
||||
registry: quay.io
|
||||
repository: opstree/redis-exporter
|
||||
tag: v1.44.0
|
||||
properties:
|
||||
pullPolicy:
|
||||
pull_policy:
|
||||
default: IfNotPresent
|
||||
enum:
|
||||
- Always
|
||||
|
||||
@@ -26,7 +26,7 @@ resource "kubectl_manifest" "onlyoffice_deploy" {
|
||||
containers:
|
||||
- name: "onlyoffice"
|
||||
image: "${var.images.onlyoffice.registry}/${var.images.onlyoffice.repository}:${var.images.onlyoffice.tag}"
|
||||
imagePullPolicy: "${var.images.onlyoffice.pullPolicy}"
|
||||
imagePullPolicy: "${var.images.onlyoffice.pull_policy}"
|
||||
env:
|
||||
- name: JWT_ENABLED
|
||||
value: "true"
|
||||
|
||||
@@ -14,7 +14,7 @@ resource "kubectl_manifest" "prj_redis" {
|
||||
spec:
|
||||
kubernetesConfig:
|
||||
image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}"
|
||||
imagePullPolicy: "${var.images.redis.pullPolicy}"
|
||||
imagePullPolicy: "${var.images.redis.pull_policy}"
|
||||
storage:
|
||||
volumeClaimTemplate:
|
||||
spec:
|
||||
|
||||
Reference in New Issue
Block a user