Skip to content

feat(kowl): add node selector variable for deployment #8

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(kowl): add node selector variable for deployment #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 15 additions & 13 deletions modules/kowl/deployment.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resource "kubernetes_deployment" "this" {

template {
metadata {
labels = local.global_labels
labels = local.global_labels
annotations = merge({
"checksum/kowl-config" = sha512(var.kowl_config),
"checksum/roles" = sha512(var.kowl_roles),
Expand All @@ -30,6 +30,8 @@ resource "kubernetes_deployment" "this" {
run_as_non_root = true
}

node_selector = var.deployment_kowl_node_selector

volume {
name = "secrets"
secret {
Expand All @@ -47,26 +49,26 @@ resource "kubernetes_deployment" "this" {
container {
name = "kowl"
image = "${var.deployment_kowl_image}:${var.deployment_kowl_image_tag}"
args = concat(
[
args = concat(
[
"--config.filepath=/etc/kowl/configs/config.yaml"],
var.secret_kafka_sasl_password != "" ? [
var.secret_kafka_sasl_password != "" ? [
"--kafka.sasl.password=$(KAFKA_SASL_PASSWORD)"] : [],
var.secret_kafka_tls_passphrase != "" ? [
var.secret_kafka_tls_passphrase != "" ? [
"--kafka.tls.passphrase=$(KAFKA_TLS_PASSPHRASE)"] : [],
var.secret_cloudhut_license_token != "" ? [
var.secret_cloudhut_license_token != "" ? [
"--cloudhut.license-token=$(CLOUDHUT_LICENSE_TOKEN)"] : [],

# Secrets for login providers
var.secret_cloudhut_license_token != "" ? [
# Secrets for login providers
var.secret_cloudhut_license_token != "" ? [
"--login.jwt-secret=$(LOGIN_JWT_SECRET)"] : [],
var.secret_login_google_oauth_client_secret != "" ? [
var.secret_login_google_oauth_client_secret != "" ? [
"--login.google.client-secret=$(LOGIN_GOOGLE_CLIENT_SECRET)"] : [],
var.secret_login_github_oauth_client_secret != "" ? [
var.secret_login_github_oauth_client_secret != "" ? [
"--login.github.client-secret=$(LOGIN_GITHUB_CLIENT_SECRET)"] : [],

# Secrets for GitHub
var.secret_topic_docs_git_basic_auth_password != "" ? [
# Secrets for GitHub
var.secret_topic_docs_git_basic_auth_password != "" ? [
"owl.topic-documentation.git.basic-auth.password=$(TOPIC_DOCUMENTATION_BASIC_AUTH_PASSWORD)"] : [],
)

Expand Down Expand Up @@ -217,4 +219,4 @@ resource "kubernetes_deployment" "this" {
}
}
}
}
}
14 changes: 10 additions & 4 deletions modules/kowl/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ variable "annotations" {
variable "labels" {
type = map(string)
description = "Map of labels that will be merged with all other labels on all kubernetes resource."
default = {
default = {
managed-by = "Terraform"
terraform-module = "cloudhut-kowl"
}
Expand All @@ -36,7 +36,7 @@ variable "deployment_name" {

variable "deployment_annotations" {
description = "Map of annotations to apply to the deployment."
default = {
default = {
"prometheus.io/scrape" = "true"
"prometheus.io/port" = 8080
"prometheus.io/path" = "/admin/metrics"
Expand All @@ -62,15 +62,15 @@ variable "deployment_replicas" {
variable "deployment_resources_limits" {
type = map(string)
description = "Resource limits that shall be assigned to the pods"
default = {
default = {
memory = "512Mi"
}
}

variable "deployment_resources_requests" {
type = map(string)
description = "Resource limits that shall be assigned to the pods"
default = {
default = {
cpu = "100m"
memory = "512Mi"
}
Expand All @@ -94,6 +94,12 @@ variable "deployment_kowl_container_port" {
default = 8080
}

variable "deployment_kowl_node_selector" {
type = map(string)
default = {}
description = "Node selector map"
}

#----------------------------------------
# Secrets
#----------------------------------------
Expand Down