diff --git a/core/src/epicli/cli/engine/EpiphanyEngine.py b/core/src/epicli/cli/engine/EpiphanyEngine.py index 160ac4210c..fe2f3e5266 100644 --- a/core/src/epicli/cli/engine/EpiphanyEngine.py +++ b/core/src/epicli/cli/engine/EpiphanyEngine.py @@ -97,7 +97,7 @@ def apply(self): self.process_infrastructure_docs() - if not self.skip_infrastructure: + if not (self.skip_infrastructure or self.is_provider_any(self.cluster_model)): # Generate terraform templates with TerraformTemplateGenerator(self.cluster_model, self.infrastructure_docs) as template_generator: template_generator.run() @@ -131,3 +131,6 @@ def dry_run(self): return [*self.input_docs, *self.configuration_docs] + @staticmethod + def is_provider_any(cluster_model): + return cluster_model["provider"] == "any" diff --git a/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml b/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml index 360c58af7d..5c7aa2787c 100644 --- a/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml +++ b/core/src/epicli/data/aws/defaults/infrastructure/virtual-machine.yml @@ -452,6 +452,26 @@ specification: destination_port_range: "9100" source_address_prefix: "10.1.0.0/20" destination_address_prefix: "0.0.0.0/0" + - name: prometheus + description: Allow connection to Prometheus + priority: 302 + direction: Inbound + access: Allow + protocol: Tcp + source_port_range: "*" + destination_port_range: "9090" + source_address_prefix: "10.1.0.0/20" + destination_address_prefix: "0.0.0.0/0" + - name: grafana + description: Allow connection to Grafana + priority: 302 + direction: Inbound + access: Allow + protocol: Tcp + source_port_range: "*" + destination_port_range: "3000" + source_address_prefix: "10.1.0.0/20" + destination_address_prefix: "0.0.0.0/0" - name: out description: Allow out priority: 101