Skip to content

refactor(ingress): flatten ingress directory structure #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmvangun merged 4 commits into from
May 26, 2025
Merged

refactor(ingress): flatten ingress directory structure #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90e85f9
refactor: flatten ingress directory structure
rmvangun May 26, 2025
9d3a2b0
Merge branch 'main' into feature/ingress-path
rmvangun May 26, 2025
305c069
chore: trigger CI checks
rmvangun May 26, 2025
22db5f6
docs
rmvangun May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions contexts/aws-example/blueprint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ kustomize:
source: core
dependsOn:
- policy-base
- name: ingress-base
path: ingress/base
- name: ingress
path: ingress
source: core
dependsOn:
- pki-resources
Expand Down Expand Up @@ -83,7 +83,7 @@ kustomize:
path: observability
source: core
dependsOn:
- ingress-base
- ingress
components:
- grafana
- grafana/ingress
Expand Down
8 changes: 4 additions & 4 deletions contexts/azure-example/blueprint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ kustomize:
components:
- private-issuer/ca
- public-issuer/selfsigned
- name: ingress-base
path: ingress/base
- name: ingress
path: ingress
source: core
dependsOn:
- pki-resources
Expand All @@ -75,15 +75,15 @@ kustomize:
path: gitops/flux
source: core
dependsOn:
- ingress-base
- ingress
force: true
components:
- webhook
- name: observability
path: observability
source: core
dependsOn:
- ingress-base
- ingress
components:
- grafana
- grafana/ingress
Expand Down
6 changes: 3 additions & 3 deletions contexts/local/blueprint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ kustomize:
components:
- openebs
- openebs/dynamic-localpv
- name: ingress-base
path: ingress/base
- name: ingress
path: ingress
dependsOn:
- pki-resources
components:
Expand Down Expand Up @@ -84,6 +84,6 @@ kustomize:
- name: gitops
path: gitops/flux
dependsOn:
- ingress-base
- ingress
components:
- webhook
0 kustomize/ingress/base/kustomization.yaml → kustomize/ingress/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 kustomize/ingress/base/namespace.yaml → kustomize/ingress/namespace.yaml
View file
Open in desktop
File renamed without changes.
0 ...ess/base/nginx/coredns/kustomization.yaml → .../ingress/nginx/coredns/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 ...e/nginx/coredns/patches/helm-release.yaml → ...s/nginx/coredns/patches/helm-release.yaml
View file
Open in desktop
File renamed without changes.
0 ...ase/nginx/flux-webhook/kustomization.yaml → ...ess/nginx/flux-webhook/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 ...nx/flux-webhook/patches/helm-release.yaml → ...nx/flux-webhook/patches/helm-release.yaml
View file
Open in desktop
File renamed without changes.
0 ...mize/ingress/base/nginx/helm-release.yaml → kustomize/ingress/nginx/helm-release.yaml
View file
Open in desktop
File renamed without changes.
0 ...e/ingress/base/nginx/helm-repository.yaml → kustomize/ingress/nginx/helm-repository.yaml
View file
Open in desktop
File renamed without changes.
0 ...ize/ingress/base/nginx/kustomization.yaml → kustomize/ingress/nginx/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 ...ase/nginx/loadbalancer/kustomization.yaml → ...ess/nginx/loadbalancer/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 ...nx/loadbalancer/patches/helm-release.yaml → ...nx/loadbalancer/patches/helm-release.yaml
View file
Open in desktop
File renamed without changes.
0 ...ss/base/nginx/nodeport/kustomization.yaml → ...ingress/nginx/nodeport/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 .../nginx/nodeport/patches/helm-release.yaml → .../nginx/nodeport/patches/helm-release.yaml
View file
Open in desktop
File renamed without changes.
0 ...ingress/base/nginx/web/kustomization.yaml → ...mize/ingress/nginx/web/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 .../base/nginx/web/patches/helm-release.yaml → ...gress/nginx/web/patches/helm-release.yaml
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions terraform/backend/azurerm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

| Name | Version |
|------|---------|
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 4.29.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 4.30.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.29.0 |
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.30.0 |
| <a name="provider_local"></a> [local](#provider\_local) | 2.5.3 |

## Modules
Expand All @@ -20,10 +20,10 @@ No modules.

| Name | Type |
|------|------|
| [azurerm_resource_group.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.29.0/docs/resources/resource_group) | resource |
| [azurerm_storage_account.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.29.0/docs/resources/storage_account) | resource |
| [azurerm_storage_container.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.29.0/docs/resources/storage_container) | resource |
| [azurerm_user_assigned_identity.storage](https://registry.terraform.io/providers/hashicorp/azurerm/4.29.0/docs/resources/user_assigned_identity) | resource |
| [azurerm_resource_group.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.30.0/docs/resources/resource_group) | resource |
| [azurerm_storage_account.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.30.0/docs/resources/storage_account) | resource |
| [azurerm_storage_container.this](https://registry.terraform.io/providers/hashicorp/azurerm/4.30.0/docs/resources/storage_container) | resource |
| [azurerm_user_assigned_identity.storage](https://registry.terraform.io/providers/hashicorp/azurerm/4.30.0/docs/resources/user_assigned_identity) | resource |
| [local_file.backend_config](https://registry.terraform.io/providers/hashicorp/local/latest/docs/resources/file) | resource |

## Inputs
Expand Down
4 changes: 2 additions & 2 deletions terraform/cluster/azure-aks/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ This module requires a paid Azure subscription. Free tier subscriptions are not
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=1.8 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 4.29.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 4.30.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.29.0 |
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.30.0 |
| <a name="provider_local"></a> [local](#provider\_local) | 2.5.3 |
| <a name="provider_random"></a> [random](#provider\_random) | 3.7.2 |
| <a name="provider_time"></a> [time](#provider\_time) | 0.13.1 |
Expand Down
10 changes: 5 additions & 5 deletions terraform/gitops/flux/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=1.7.3 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | 2.36.0 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | 2.37.1 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.17.0 |
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.36.0 |
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.37.1 |

## Modules

Expand All @@ -22,9 +22,9 @@ No modules.
| Name | Type |
|------|------|
| [helm_release.flux_system](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
| [kubernetes_namespace.flux_system](https://registry.terraform.io/providers/hashicorp/kubernetes/2.36.0/docs/resources/namespace) | resource |
| [kubernetes_secret.git_auth](https://registry.terraform.io/providers/hashicorp/kubernetes/2.36.0/docs/resources/secret) | resource |
| [kubernetes_secret.webhook_token](https://registry.terraform.io/providers/hashicorp/kubernetes/2.36.0/docs/resources/secret) | resource |
| [kubernetes_namespace.flux_system](https://registry.terraform.io/providers/hashicorp/kubernetes/2.37.1/docs/resources/namespace) | resource |
| [kubernetes_secret.git_auth](https://registry.terraform.io/providers/hashicorp/kubernetes/2.37.1/docs/resources/secret) | resource |
| [kubernetes_secret.webhook_token](https://registry.terraform.io/providers/hashicorp/kubernetes/2.37.1/docs/resources/secret) | resource |

## Inputs

Expand Down
2 changes: 2 additions & 0 deletions terraform/network/aws-vpc/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,3 +309,5 @@ resource "aws_route53_zone" "main" {
vpc_id = aws_vpc.main.id
}
}

# Trigger CI checks
4 changes: 2 additions & 2 deletions terraform/network/azure-vnet/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=1.8 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 4.29.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 4.30.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.29.0 |
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.30.0 |

## Modules

Expand Down
Loading