Skip to content

Commit

Permalink
Merge pull request #21 from mindwm/fix-istiod-deployment
Browse files Browse the repository at this point in the history
fix istio deployment
  • Loading branch information
metacoma authored May 31, 2024
2 parents 1c0e5ee + 652ade5 commit 7ea63ae
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 47 deletions.
92 changes: 46 additions & 46 deletions config.k
Original file line number Diff line number Diff line change
Expand Up @@ -3,71 +3,71 @@ kafka = {
namespace = "redpanda"
port = 9093
brokerEndpoint = cluster_name + "." + namespace + ":${port}"
mkContextCdcTopicName = lambda context_name : str {
context_name + "-cdc-topic"
mkContextCdcTopicName = lambda context_name : str {
context_name + "-cdc-topic"
}
}
}

knativeBroker = {
deadLetterImage = "gcr.io/knative-releases/knative.dev/eventing/cmd/event_display"
}
}

contextBroker = {
name = lambda context_name : str {
"context-broker" + delimiter + context_name
}
}
configMapName = lambda context_name : str {
name(context_name) + delimiter + "configmap"
}
}
kafkaSourceName = lambda context_name : str {
name(context_name) + delimiter + "source"
}

}
deadLetterName = lambda context_name : str {
name(context_name) + delimiter + "dead-letter"
}
}
}
}


Mindwm = {
user = {
namespace = lambda username : str -> str {
"user-" + username
}
}
broker = {
configmap = lambda user_name : str -> str {
"user" + delimiter + user_name + delimiter + "broker-configmap"
}
}
name = lambda user_name : str -> str {
"user" + delimiter + user_name + delimiter + "broker"
}
}
}
}
deadLetter = {
name = lambda user_name : str -> str {
"user" + delimiter + user_name + delimiter + "dead-letter"
"user" + delimiter + user_name + delimiter + "dead-letter"
}
}
}
contextTrigger = {
name = lambda context_name : str -> str {
"trigger-user-broker-to" + delimiter + context_name
}
}
crossplane_name = lambda user_name : str, context_name : str -> str {
"trigger" + delimiter + user_name + delimiter + "broker-to" + delimiter + context_name
}
}
}
}
}
host = {
broker = {
configmap = lambda host_name : str -> str {
host_name + delimiter + "broker-configmap"
}
}
name = lambda host_name : str -> str {
host_name + delimiter + "broker"
}
}
}
}
trigger = lambda host_name : str -> str {
# FIXME (@metacoma)
# host trigger name = "trigger-{host_name}-broker-to-user-broker
# FIXME (@metacoma)
# host trigger name = "trigger-{host_name}-broker-to-user-broker
"trigger-host-broker-to" + delimiter + host_name
}
}
Expand All @@ -76,24 +76,24 @@ Mindwm = {
io_context = {
name = "io-context"
crossplane_name = lambda context_name : str -> str {
context_name + delimiter + "io-context"
context_name + delimiter + "io-context"
}
crossplane_trigger = lambda context_name : str -> str {
context_name + delimiter + "io-context-trigger"
context_name + delimiter + "io-context-trigger"
}

image = "metacoma/knative-neomodel:latest"
}
}
}
}
}
}

knative = {
serving = {
namespace = "knative-serving"
}
}
eventing = {
namespace = "knative-eventing"
}
}
}

istio = {
Expand All @@ -103,10 +103,10 @@ istio = {
}
gateway = {
namespace = "istio-system"
}
}
pilot = {
cpu_req = 100m
}
cpu_req = "200m"
}
}

kafka_cluster_name = "neo4j-cdc"
Expand All @@ -115,31 +115,31 @@ kafka_port = 9003
#neo4j_password = "password"
crossplane = {
namespace = "crossplane-system"
}
}


prometheus = {
namespace = "monitoring"
}
}

delimiter = "-"

contextNamespacePrefix = "context"
userNamespacePrefix = "team"
contextNamespacePrefix = "context"
userNamespacePrefix = "team"

makeUserNamespace = lambda username : str {
userNamespacePrefix + delimiter + username
}
}

makeContextNamespace = lambda ns_name : str {
contextNamespacePrefix + delimiter + ns_name
}
}

makeKafkaTopicName = lambda context_name : str {
"context" + delimiter + context_name + delimiter + "cdc"
}
}

neo4j = {
neo4j = {
version = "4.4.33"
username = "neo4j"
password = "password"
Expand All @@ -148,17 +148,17 @@ neo4j = {

crossplane_pvc_name = lambda context_name : str -> str {
context_name + delimiter + "neo4j-plugin-pvc"
}
}

crossplane_name = lambda context_name : str -> str {
context_name + delimiter + "neo4j"
}
}
}
}

kiali_operator = {
namespace = "kiali-operator"
release_name = "kiali-operator"
}
}

config = {
kafka_cluster_name = "neo4j-cdc"
Expand Down
2 changes: 1 addition & 1 deletion main.k
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ mindwm_app = ArgoCdOrder.make({
chart = charts.istiod
version = config.istio.version
values = {
defaults.pilot.resources.requests = config.istio.pilot.cpu_req
defaults.pilot.resources.requests.cpu = config.istio.pilot.cpu_req
}

})
Expand Down

0 comments on commit 7ea63ae

Please sign in to comment.