diff --git a/firewall-dev/ks-vm.yaml b/firewall-dev/ks-vm.yaml deleted file mode 100644 index 11a4382..0000000 --- a/firewall-dev/ks-vm.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app fortigate - namespace: ${TENANT_NAMESPACE} -spec: - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./firewall-dev/vm - prune: true - sourceRef: - kind: GitRepository - name: tenant-repos - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m \ No newline at end of file diff --git a/firewall-dev/vm/fortigate.yaml b/firewall-dev/vm/fortigate.yaml deleted file mode 100644 index c0433e6..0000000 --- a/firewall-dev/vm/fortigate.yaml +++ /dev/null @@ -1,64 +0,0 @@ -apiVersion: kubevirt.io/v1 -kind: VirtualMachine -metadata: - name: fortigate-dev - namespace: ${TENANT_NAMESPACE} -spec: - dataVolumeTemplates: - - metadata: - name: fortigate-rootdisk-dev - spec: - source: - http: - url: https://glacier-1.kvant.cloud/ocp-virt-images/sources/fortios_v7_6_3.qcow2 - storage: - resources: - requests: - storage: 30Gi - runStrategy: Always - template: - metadata: - labels: - kubevirt.io/domain: fortigate-dev - spec: - domain: - cpu: - cores: 2 - memory: - guest: 4Gi - features: - acpi: {} - smm: - enabled: true - firmware: - bootloader: - efi: - secureBoot: true - devices: - rng: {} - networkInterfaceMultiqueue: true - interfaces: - - name: default - masquerade: {} - ports: - - port: 443 - - port: 22 - disks: - - disk: - bus: sata - name: rootdisk - resources: - requests: - memory: 4Gi - cpu: 2 - limits: - memory: 4Gi - cpu: 2 - networks: - - name: default - pod: {} - terminationGracePeriodSeconds: 180 - volumes: - - name: rootdisk - dataVolume: - name: fortigate-rootdisk-dev \ No newline at end of file diff --git a/kustomization.yaml b/kustomization.yaml index 3214af5..bc48a2c 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -5,7 +5,6 @@ resources: - repos/ks.yaml - network/ks-lb.yaml - firewall/ks-vm.yaml - - firewall-dev/ks-vm.yaml - windows-vm-standard/ks-vm.yaml - windows-vm-standard/ks-pvc.yaml - windows-vm-standard-dev/ks-vm.yaml diff --git a/templates/image-server/nginx/helmrelease.yaml b/templates/image-server/nginx/helmrelease.yaml index db7bca5..36c74d9 100644 --- a/templates/image-server/nginx/helmrelease.yaml +++ b/templates/image-server/nginx/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: nginx - version: 21.0.2 + version: 21.0.1 sourceRef: kind: HelmRepository name: bitnami