Skip to content

Commit b169bb9

Browse files
hyderhyder
authored
fix: updated admin templates for using nip.io (#22)
Signed-off-by: Ali Mukadam <ali.mukadam@oracle.com>
1 parent efa8870 commit b169bb9

File tree

7 files changed

+38
-146
lines changed

7 files changed

+38
-146
lines changed

‎main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ module "clusters" {
7373
module "verrazzano" {
7474
source = "./modules/verrazzano"
7575

76+
label_prefix = var.label_prefix
77+
7678
bastion_ip = module.admin.bastion_public_ip
7779

7880
operator_ip = module.admin.operator_private_ip

‎modules/verrazzano/resources/vz_admin.template.yaml‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: admin
55
spec:
66
profile: ${profile}
7-
environmentName: admin
7+
environmentName: ${environment}
88
components:
99
argoCD:
1010
enabled: ${argocd}
@@ -72,37 +72,6 @@ spec:
7272
service.beta.kubernetes.io/oci-load-balancer-shape-flex-max: "${flex_max}"
7373
service.beta.kubernetes.io/oci-load-balancer-security-list-management-mode: "None"
7474
oci.oraclecloud.com/oci-network-security-groups: "${data_plane_nsg}"
75-
# - name: istio-eastwestgateway
76-
# enabled: true
77-
# k8s:
78-
# serviceAnnotations:
79-
# service.beta.kubernetes.io/oci-load-balancer-internal: "true"
80-
# service.beta.kubernetes.io/oci-load-balancer-shape: "10Mbps"
81-
# service.beta.kubernetes.io/oci-load-balancer-shape-flex-min: "50"
82-
# service.beta.kubernetes.io/oci-load-balancer-shape-flex-max: "100"
83-
# service.beta.kubernetes.io/oci-load-balancer-security-list-management-mode: "None"
84-
# oci.oraclecloud.com/oci-network-security-groups: "${int-nsg-id}"
85-
# env:
86-
# - name: ISTIO_META_REQUESTED_NETWORK_VIEW
87-
# value: admin
88-
# service:
89-
# ports:
90-
# - name: status-port
91-
# port: 15021
92-
# targetPort: 15021
93-
# - name: tls
94-
# port: 15443
95-
# targetPort: 15443
96-
# - name: tls-istiod
97-
# port: 15012
98-
# targetPort: 15012
99-
# - name: tls-webhook
100-
# port: 15017
101-
# targetPort: 15017
102-
# label:
103-
# app: istio-eastwestgateway
104-
# istio: eastwestgateway
105-
# topology.istio.io/network: admin
10675
jaegerOperator:
10776
enabled: ${jaeger}
10877
kiali:

‎modules/verrazzano/resources/vz_admin_nip.template.yaml‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: admin
55
spec:
66
profile: ${profile}
7-
environmentName: admin
7+
environmentName: ${environment}
88
components:
99
argoCD:
1010
enabled: ${argocd}
@@ -69,37 +69,7 @@ spec:
6969
service.beta.kubernetes.io/oci-load-balancer-shape-flex-max: "${flex_max}"
7070
service.beta.kubernetes.io/oci-load-balancer-security-list-management-mode: "None"
7171
oci.oraclecloud.com/oci-network-security-groups: "${data_plane_nsg}"
72-
- name: istio-eastwestgateway
73-
enabled: true
74-
k8s:
75-
serviceAnnotations:
76-
service.beta.kubernetes.io/oci-load-balancer-internal: "true"
77-
service.beta.kubernetes.io/oci-load-balancer-shape: "10Mbps"
78-
service.beta.kubernetes.io/oci-load-balancer-shape-flex-min: "50"
79-
service.beta.kubernetes.io/oci-load-balancer-shape-flex-max: "100"
80-
service.beta.kubernetes.io/oci-load-balancer-security-list-management-mode: "None"
81-
oci.oraclecloud.com/oci-network-security-groups: "${int-nsg-id}"
82-
env:
83-
- name: ISTIO_META_REQUESTED_NETWORK_VIEW
84-
value: admin
85-
service:
86-
ports:
87-
- name: status-port
88-
port: 15021
89-
targetPort: 15021
90-
- name: tls
91-
port: 15443
92-
targetPort: 15443
93-
- name: tls-istiod
94-
port: 15012
95-
targetPort: 15012
96-
- name: tls-webhook
97-
port: 15017
98-
targetPort: 15017
99-
label:
100-
app: istio-eastwestgateway
101-
istio: eastwestgateway
102-
topology.istio.io/network: admin
72+
10373
jaegerOperator:
10474
enabled: ${jaeger}
10575
kiali:

‎modules/verrazzano/resources/vz_mc.template.yaml‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -56,37 +56,6 @@ spec:
5656
service.beta.kubernetes.io/oci-load-balancer-shape-flex-max: "${flex_max}"
5757
service.beta.kubernetes.io/oci-load-balancer-security-list-management-mode: "None"
5858
oci.oraclecloud.com/oci-network-security-groups: "${data_plane_nsg}"
59-
# - name: istio-eastwestgateway
60-
# enabled: true
61-
# k8s:
62-
# serviceAnnotations:
63-
# service.beta.kubernetes.io/oci-load-balancer-internal: "true"
64-
# service.beta.kubernetes.io/oci-load-balancer-shape: "10Mbps"
65-
# service.beta.kubernetes.io/oci-load-balancer-shape-flex-min: "50"
66-
# service.beta.kubernetes.io/oci-load-balancer-shape-flex-max: "100"
67-
# service.beta.kubernetes.io/oci-load-balancer-security-list-management-mode: "None"
68-
# oci.oraclecloud.com/oci-network-security-groups: "${int-nsg-id}"
69-
# env:
70-
# - name: ISTIO_META_REQUESTED_NETWORK_VIEW
71-
# value: ${mesh_network}
72-
# service:
73-
# ports:
74-
# - name: status-port
75-
# port: 15021
76-
# targetPort: 15021
77-
# - name: tls
78-
# port: 15443
79-
# targetPort: 15443
80-
# - name: tls-istiod
81-
# port: 15012
82-
# targetPort: 15012
83-
# - name: tls-webhook
84-
# port: 15017
85-
# targetPort: 15017
86-
# label:
87-
# app: istio-eastwestgateway
88-
# istio: eastwestgateway
89-
# topology.istio.io/network: ${mesh_network}
9059
jaegerOperator:
9160
enabled: ${jaeger}
9261
kiali:

‎modules/verrazzano/resources/vz_mc_nip.template.yaml‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -53,37 +53,6 @@ spec:
5353
service.beta.kubernetes.io/oci-load-balancer-shape-flex-max: "${flex_max}"
5454
service.beta.kubernetes.io/oci-load-balancer-security-list-management-mode: "None"
5555
oci.oraclecloud.com/oci-network-security-groups: "${data_plane_nsg}"
56-
- name: istio-eastwestgateway
57-
enabled: true
58-
k8s:
59-
serviceAnnotations:
60-
service.beta.kubernetes.io/oci-load-balancer-internal: "true"
61-
service.beta.kubernetes.io/oci-load-balancer-shape: "10Mbps"
62-
service.beta.kubernetes.io/oci-load-balancer-shape-flex-min: "50"
63-
service.beta.kubernetes.io/oci-load-balancer-shape-flex-max: "100"
64-
service.beta.kubernetes.io/oci-load-balancer-security-list-management-mode: "None"
65-
oci.oraclecloud.com/oci-network-security-groups: "${int-nsg-id}"
66-
env:
67-
- name: ISTIO_META_REQUESTED_NETWORK_VIEW
68-
value: admin
69-
service:
70-
ports:
71-
- name: status-port
72-
port: 15021
73-
targetPort: 15021
74-
- name: tls
75-
port: 15443
76-
targetPort: 15443
77-
- name: tls-istiod
78-
port: 15012
79-
targetPort: 15012
80-
- name: tls-webhook
81-
port: 15017
82-
targetPort: 15017
83-
label:
84-
app: istio-eastwestgateway
85-
istio: eastwestgateway
86-
topology.istio.io/network: ${mesh_network}
8756
jaegerOperator:
8857
enabled: ${jaeger}
8958
kiali:

‎modules/verrazzano/templates.tf‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ locals {
8686
compartment_id = var.dns_compartment_id
8787
dns_zone_id = var.dns_zone_id
8888
dns_zone_name = var.dns_zone_name
89+
environment = "${var.label_prefix}-admin"
8990
fluentd = var.fluentd
9091
grafana = var.grafana
9192
control_plane = var.verrazzano_control_plane == "public" ? false : true
@@ -111,25 +112,32 @@ locals {
111112
weblogic_operator = var.weblogic_operator
112113
}
113114
) : templatefile("${path.module}/resources/vz_admin_nip.template.yaml", {
114-
compartment_id = var.dns_compartment_id
115-
profile = var.verrazzano_profile
116-
control_plane = var.verrazzano_control_plane == "public" ? false : true
117-
control_plane_nsg = var.verrazzano_control_plane == "public" ? lookup(var.pub_nsg_ids, "admin") : lookup(var.int_nsg_ids, "admin")
118-
data_plane = var.verrazzano_data_plane == "public" ? false : true
119-
data_plane_nsg = var.verrazzano_data_plane == "public" ? lookup(var.pub_nsg_ids, "admin") : lookup(var.int_nsg_ids, "admin")
120-
lb_shape = lookup(var.verrazzano_load_balancer, "shape")
121-
flex_min = lookup(var.verrazzano_load_balancer, "flex_min")
122-
flex_max = lookup(var.verrazzano_load_balancer, "flex_max")
123-
int-nsg-id = lookup(var.int_nsg_ids, "admin")
124-
jaeger = var.jaeger
125-
kiali = var.kiali
126-
kube_state_metrics = var.kube_state_metrics
127-
mesh_id = var.mesh_id
128-
mesh_network = "admin"
129-
prometheus = var.prometheus
130-
prometheus_operator = var.prometheus_operator
131-
velero = var.velero
132-
weblogic_operator = var.weblogic_operator
115+
profile = var.verrazzano_profile
116+
argocd = var.argocd
117+
coherence = var.coherence
118+
console = var.console
119+
environment = "${var.label_prefix}-admin"
120+
fluentd = var.fluentd
121+
grafana = var.grafana
122+
control_plane = var.verrazzano_control_plane == "public" ? false : true
123+
control_plane_nsg = var.verrazzano_control_plane == "public" ? lookup(var.pub_nsg_ids, "admin") : lookup(var.int_nsg_ids, "admin")
124+
data_plane = var.verrazzano_data_plane == "public" ? false : true
125+
data_plane_nsg = var.verrazzano_data_plane == "public" ? lookup(var.pub_nsg_ids, "admin") : lookup(var.int_nsg_ids, "admin")
126+
lb_shape = lookup(var.verrazzano_load_balancer, "shape")
127+
flex_min = lookup(var.verrazzano_load_balancer, "flex_min")
128+
flex_max = lookup(var.verrazzano_load_balancer, "flex_max")
129+
int-nsg-id = lookup(var.int_nsg_ids, "admin")
130+
jaeger = var.jaeger
131+
kiali = var.kiali
132+
kube_state_metrics = var.kube_state_metrics
133+
mesh_id = var.mesh_id
134+
mesh_network = "admin"
135+
opensearch = var.opensearch
136+
opensearch_dashboards = var.opensearch_dashboards
137+
prometheus = var.prometheus
138+
prometheus_operator = var.prometheus_operator
139+
velero = var.velero
140+
weblogic_operator = var.weblogic_operator
133141
}
134142
)
135143

@@ -177,7 +185,8 @@ locals {
177185
k => templatefile("${path.module}/resources/vz_mc_nip.template.yaml",
178186
{
179187
cluster = k
180-
compartment_id = var.dns_compartment_id
188+
coherence = var.coherence
189+
fluentd = var.fluentd
181190
control_plane = var.verrazzano_control_plane == "public" ? false : true
182191
control_plane_nsg = var.verrazzano_control_plane == "public" ? lookup(var.pub_nsg_ids, k) : lookup(var.int_nsg_ids, k)
183192
data_plane = var.verrazzano_data_plane == "public" ? false : true

‎modules/verrazzano/variables.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Copyright (c) 2023 Oracle Corporation and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
33

4+
variable "label_prefix" {
5+
type = string
6+
}
7+
48
variable "bastion_ip" {
59
type = string
610
}

0 commit comments

Comments
 (0)