scottk/terraform-talos
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/terraform-talos.git synced 2025-11-02 11:18:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

do refactoring

Browse Source
This commit is contained in:
Serge Logvinov
2021-10-02 08:07:54 +03:00
parent 17ddee9699
commit d69d652081
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hetzner/deployments/cilium_result.yaml
View File

@@ -127,9 +127,6 @@ data:
# Enables L7 proxy for L7 policy enforcement and visibility # Enables L7 proxy for L7 policy enforcement and visibility
enable-l7-proxy: "true" enable-l7-proxy: "true"
# wait-bpf-mount makes init container wait until bpf filesystem is mounted
wait-bpf-mount: "false"
enable-ipv4-masquerade: "true" enable-ipv4-masquerade: "true"
enable-ipv6-masquerade: "true" enable-ipv6-masquerade: "true"
enable-bpf-masquerade: "false" enable-bpf-masquerade: "false"
@@ -543,7 +540,7 @@ spec:
value: "172.16.0.10" value: "172.16.0.10"
- name: KUBERNETES_SERVICE_PORT - name: KUBERNETES_SERVICE_PORT
value: "6443" value: "6443"
image: "quay.io/cilium/cilium:v1.10.3@sha256:8419531c5d3677158802882bdfe2297915c43f2ebe3649551aaac22de9f6d565" image: "quay.io/cilium/cilium:v1.10.4@sha256:7d354052ccf2a7445101d78cebd14444c7c40129ce7889f2f04b89374dbf8a1d"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
postStart: postStart:
@@ -620,17 +617,11 @@ spec:
key: clean-cilium-bpf-state key: clean-cilium-bpf-state
name: cilium-config name: cilium-config
optional: true optional: true
- name: CILIUM_WAIT_BPF_MOUNT
valueFrom:
configMapKeyRef:
key: wait-bpf-mount
name: cilium-config
optional: true
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: "172.16.0.10" value: "172.16.0.10"
- name: KUBERNETES_SERVICE_PORT - name: KUBERNETES_SERVICE_PORT
value: "6443" value: "6443"
image: "quay.io/cilium/cilium:v1.10.3@sha256:8419531c5d3677158802882bdfe2297915c43f2ebe3649551aaac22de9f6d565" image: "quay.io/cilium/cilium:v1.10.4@sha256:7d354052ccf2a7445101d78cebd14444c7c40129ce7889f2f04b89374dbf8a1d"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: clean-cilium-state name: clean-cilium-state
securityContext: securityContext:
@@ -641,7 +632,6 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /sys/fs/bpf - mountPath: /sys/fs/bpf
name: bpf-maps name: bpf-maps
mountPropagation: HostToContainer
# Required to mount cgroup filesystem from the host to cilium agent pod # Required to mount cgroup filesystem from the host to cilium agent pod
- mountPath: /sys/fs/cgroup - mountPath: /sys/fs/cgroup
name: cilium-cgroup name: cilium-cgroup
@@ -786,7 +776,7 @@ spec:
value: "172.16.0.10" value: "172.16.0.10"
- name: KUBERNETES_SERVICE_PORT - name: KUBERNETES_SERVICE_PORT
value: "6443" value: "6443"
image: "quay.io/cilium/operator-generic:v1.10.3@sha256:337ebf27eae4fbad51cc4baf9110b3ec6753320dd33075bc136e2a1865be5eb5" image: "quay.io/cilium/operator-generic:v1.10.4@sha256:c49a14e34634ff1a494c84b718641f27267fb3a0291ce3d74352b44f8a8d2f93"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: cilium-operator name: cilium-operator
livenessProbe: livenessProbe:

6
system_os/digitalocean/Makefile Normal file
View File

@@ -0,0 +1,6 @@
init:
packer init -upgrade .
release:
packer build -only=release.digitalocean.talos .

4
system_os/digitalocean/do.pkr.hcl
View File

@@ -14,6 +14,7 @@ source "digitalocean" "talos" {
region = var.do_region region = var.do_region
size = "s-1vcpu-1gb" size = "s-1vcpu-1gb"
monitoring = false monitoring = false
rescue = true
ipv6 = true ipv6 = true
private_networking = false private_networking = false
@@ -24,9 +25,10 @@ source "digitalocean" "talos" {
snapshot_regions = [var.do_region] snapshot_regions = [var.do_region]
} }
# FIXME
build { build {
name = "release"
sources = ["source.digitalocean.talos"] sources = ["source.digitalocean.talos"]
provisioner "shell" { provisioner "shell" {
inline = [ inline = [
"apt-get install -y wget", "apt-get install -y wget",

2
system_os/digitalocean/variables.pkr.hcl
View File

@@ -12,5 +12,5 @@ variable "do_region" {
variable "talos_version" { variable "talos_version" {
type = string type = string
default = "v0.11.0" default = "v0.12.2"
} }