Skip to content

Commit 45c4d78

Browse files
redeuxredeux
committed
Update namespace interpolation
1 parent d8f2edd commit 45c4d78

26 files changed

+48
-48
lines changed

‎alerts.notification.toolkit.fluxcd.io-crd.yaml.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "kubernetes_manifest" "customresourcedefinition_alerts_notification_too
99
"controller-gen.kubebuilder.io/version" = "v0.4.1"
1010
}
1111
"labels" = {
12-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
12+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1313
"app.kubernetes.io/version" = var.flux_version
1414
}
1515
"name" = "alerts.notification.toolkit.fluxcd.io"

‎allow-scraping-networkpolicy.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ resource "kubernetes_manifest" "networkpolicy_allow_scraping" {
66
"kind" = "NetworkPolicy"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
}
1212
"name" = "allow-scraping"
13-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
13+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1414
}
1515
"spec" = {
1616
"ingress" = [

‎allow-webhooks-networkpolicy.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ resource "kubernetes_manifest" "networkpolicy_allow_webhooks" {
66
"kind" = "NetworkPolicy"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
}
1212
"name" = "allow-webhooks"
13-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
13+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1414
}
1515
"spec" = {
1616
# kubectl strips this out to prevent API erros but Terraform does not

‎buckets.source.toolkit.fluxcd.io-crd.yaml.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "kubernetes_manifest" "customresourcedefinition_buckets_source_toolkit_
99
"controller-gen.kubebuilder.io/version" = "v0.4.1"
1010
}
1111
"labels" = {
12-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
12+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1313
"app.kubernetes.io/version" = var.flux_version
1414
}
1515
"name" = "buckets.source.toolkit.fluxcd.io"

‎cluster-reconciler-flux-system-crb.yaml.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resource "kubernetes_manifest" "clusterrolebinding_cluster_reconciler_flux_syste
66
"kind" = "ClusterRoleBinding"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
}
1212
"name" = "cluster-reconciler-flux-system"
@@ -20,12 +20,12 @@ resource "kubernetes_manifest" "clusterrolebinding_cluster_reconciler_flux_syste
2020
{
2121
"kind" = "ServiceAccount"
2222
"name" = "kustomize-controller"
23-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
23+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
2424
},
2525
{
2626
"kind" = "ServiceAccount"
2727
"name" = "helm-controller"
28-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
28+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
2929
},
3030
]
3131
}

‎crd-controller-flux-system-cr.yaml.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resource "kubernetes_manifest" "clusterrole_crd_controller_flux_system" {
66
"kind" = "ClusterRole"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
}
1212
"name" = "crd-controller-flux-system"

‎crd-controller-flux-system-crb.yaml.tf

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resource "kubernetes_manifest" "clusterrolebinding_crd_controller_flux_system" {
66
"kind" = "ClusterRoleBinding"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
}
1212
"name" = "crd-controller-flux-system"
@@ -20,32 +20,32 @@ resource "kubernetes_manifest" "clusterrolebinding_crd_controller_flux_system" {
2020
{
2121
"kind" = "ServiceAccount"
2222
"name" = "kustomize-controller"
23-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
23+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
2424
},
2525
{
2626
"kind" = "ServiceAccount"
2727
"name" = "helm-controller"
28-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
28+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
2929
},
3030
{
3131
"kind" = "ServiceAccount"
3232
"name" = "source-controller"
33-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
33+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
3434
},
3535
{
3636
"kind" = "ServiceAccount"
3737
"name" = "notification-controller"
38-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
38+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
3939
},
4040
{
4141
"kind" = "ServiceAccount"
4242
"name" = "image-reflector-controller"
43-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
43+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
4444
},
4545
{
4646
"kind" = "ServiceAccount"
4747
"name" = "image-automation-controller"
48-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
48+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
4949
},
5050
]
5151
}

‎deny-ingress-networkpolicy.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ resource "kubernetes_manifest" "networkpolicy_deny_ingress" {
66
"kind" = "NetworkPolicy"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
}
1212
"name" = "deny-ingress"
13-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
13+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1414
}
1515
"spec" = {
1616
# kubectl strips this out to prevent API erros but Terraform does not

‎gitrepositories.source.toolkit.fluxcd.io-crd.yaml.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "kubernetes_manifest" "customresourcedefinition_gitrepositories_source_
99
"controller-gen.kubebuilder.io/version" = "v0.4.1"
1010
}
1111
"labels" = {
12-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
12+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1313
"app.kubernetes.io/version" = var.flux_version
1414
}
1515
"name" = "gitrepositories.source.toolkit.fluxcd.io"

‎helm-controller-deployment.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ resource "kubernetes_manifest" "deployment_helm_controller" {
66
"kind" = "Deployment"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
"control-plane" = "controller"
1212
}
1313
"name" = "helm-controller"
14-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
14+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1515
}
1616
"spec" = {
1717
"replicas" = 1

‎helm-controller-sa.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ resource "kubernetes_manifest" "serviceaccount_helm_controller" {
66
"kind" = "ServiceAccount"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
}
1212
"name" = "helm-controller"
13-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
13+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1414
}
1515
}
1616
}

‎helmcharts.source.toolkit.fluxcd.io-crd.yaml.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "kubernetes_manifest" "customresourcedefinition_helmcharts_source_toolk
99
"controller-gen.kubebuilder.io/version" = "v0.4.1"
1010
}
1111
"labels" = {
12-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
12+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1313
"app.kubernetes.io/version" = var.flux_version
1414
}
1515
"name" = "helmcharts.source.toolkit.fluxcd.io"

‎helmreleases.helm.toolkit.fluxcd.io-crd.yaml.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "kubernetes_manifest" "customresourcedefinition_helmreleases_helm_toolk
99
"controller-gen.kubebuilder.io/version" = "v0.4.1"
1010
}
1111
"labels" = {
12-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
12+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1313
"app.kubernetes.io/version" = var.flux_version
1414
}
1515
"name" = "helmreleases.helm.toolkit.fluxcd.io"

‎helmrepositories.source.toolkit.fluxcd.io-crd.yaml.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "kubernetes_manifest" "customresourcedefinition_helmrepositories_source
99
"controller-gen.kubebuilder.io/version" = "v0.4.1"
1010
}
1111
"labels" = {
12-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
12+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1313
"app.kubernetes.io/version" = var.flux_version
1414
}
1515
"name" = "helmrepositories.source.toolkit.fluxcd.io"

‎kustomizations.kustomize.toolkit.fluxcd.io-crd.yaml.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "kubernetes_manifest" "customresourcedefinition_kustomizations_kustomiz
99
"controller-gen.kubebuilder.io/version" = "v0.4.1"
1010
}
1111
"labels" = {
12-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
12+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1313
"app.kubernetes.io/version" = var.flux_version
1414
}
1515
"name" = "kustomizations.kustomize.toolkit.fluxcd.io"

‎kustomize-controller-deployment.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ resource "kubernetes_manifest" "deployment_kustomize_controller" {
66
"kind" = "Deployment"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
"control-plane" = "controller"
1212
}
1313
"name" = "kustomize-controller"
14-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
14+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1515
}
1616
"spec" = {
1717
"replicas" = 1

‎kustomize-controller-sa.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ resource "kubernetes_manifest" "serviceaccount_kustomize_controller" {
66
"kind" = "ServiceAccount"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
}
1212
"name" = "kustomize-controller"
13-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
13+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1414
}
1515
}
1616
}

‎notification-controller-deployment.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ resource "kubernetes_manifest" "deployment_notification_controller" {
66
"kind" = "Deployment"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
"control-plane" = "controller"
1212
}
1313
"name" = "notification-controller"
14-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
14+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1515
}
1616
"spec" = {
1717
"replicas" = 1

‎notification-controller-sa.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ resource "kubernetes_manifest" "serviceaccount_notification_controller" {
66
"kind" = "ServiceAccount"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
}
1212
"name" = "notification-controller"
13-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
13+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1414
}
1515
}
1616
}

‎notification-controller-svc.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ resource "kubernetes_manifest" "service_notification_controller" {
66
"kind" = "Service"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
"control-plane" = "controller"
1212
}
1313
"name" = "notification-controller"
14-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
14+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1515
}
1616
"spec" = {
1717
"ports" = [

‎providers.notification.toolkit.fluxcd.io-crd.yaml.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "kubernetes_manifest" "customresourcedefinition_providers_notification_
99
"controller-gen.kubebuilder.io/version" = "v0.4.1"
1010
}
1111
"labels" = {
12-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
12+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1313
"app.kubernetes.io/version" = var.flux_version
1414
}
1515
"name" = "providers.notification.toolkit.fluxcd.io"

‎receivers.notification.toolkit.fluxcd.io-crd.yaml.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "kubernetes_manifest" "customresourcedefinition_receivers_notification_
99
"controller-gen.kubebuilder.io/version" = "v0.4.1"
1010
}
1111
"labels" = {
12-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
12+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1313
"app.kubernetes.io/version" = var.flux_version
1414
}
1515
"name" = "receivers.notification.toolkit.fluxcd.io"

‎source-controller-deployment.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ resource "kubernetes_manifest" "deployment_source_controller" {
66
"kind" = "Deployment"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
"control-plane" = "controller"
1212
}
1313
"name" = "source-controller"
14-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
14+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1515
}
1616
"spec" = {
1717
"replicas" = 1

‎source-controller-sa.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ resource "kubernetes_manifest" "serviceaccount_source_controller" {
66
"kind" = "ServiceAccount"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
}
1212
"name" = "source-controller"
13-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
13+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1414
}
1515
}
1616
}

‎source-controller-svc.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ resource "kubernetes_manifest" "service_source_controller" {
66
"kind" = "Service"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
"control-plane" = "controller"
1212
}
1313
"name" = "source-controller"
14-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
14+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1515
}
1616
"spec" = {
1717
"ports" = [

‎webhook-receiver-svc.yaml.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ resource "kubernetes_manifest" "service_webhook_receiver" {
66
"kind" = "Service"
77
"metadata" = {
88
"labels" = {
9-
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.manifest.name
9+
"app.kubernetes.io/instance" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1010
"app.kubernetes.io/version" = var.flux_version
1111
"control-plane" = "controller"
1212
}
1313
"name" = "webhook-receiver"
14-
"namespace" = kubernetes_manifest.namespace_flux_system.object.manifest.name
14+
"namespace" = kubernetes_manifest.namespace_flux_system.object.metadata.name
1515
}
1616
"spec" = {
1717
"ports" = [

0 commit comments

Comments
 (0)