Skip to content

Commit 3c9e2b1

Browse files
authored
Merge pull request #426 from junior/three-two
Complete Stack - Version Update - Easter release
2 parents 0424fa5 + e1093b7 commit 3c9e2b1

File tree

13 files changed

+248
-251
lines changed

13 files changed

+248
-251
lines changed

deploy/complete/helm-chart/setup/requirements.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@
55
dependencies:
66
# Prometheus
77
- name: prometheus
8-
version: 20.0.1
8+
version: 25.18.0
99
condition: prometheus.enabled
1010
repository: https://prometheus-community.github.io/helm-charts
1111
# Grafana
1212
- name: grafana
13-
version: 6.52.4
13+
version: 7.3.7
1414
condition: grafana.enabled
1515
repository: https://grafana.github.io/helm-charts
1616
# HPA Metrics
1717
- name: metrics-server
18-
version: 3.8.4
18+
version: 3.12.0
1919
condition: metrics-server.enabled
2020
repository: https://kubernetes-sigs.github.io/metrics-server
2121
# Ingress Controller
2222
- name: ingress-nginx
23-
version: 4.5.2
23+
version: 4.10.0
2424
condition: ingress-nginx.enabled
2525
repository: https://kubernetes.github.io/ingress-nginx
2626
# cert-manager
2727
- name: cert-manager
28-
version: 1.11.0
28+
version: 1.14.4
2929
condition: cert-manager.enabled
3030
repository: https://charts.jetstack.io
3131
# jenkins

deploy/complete/terraform/.terraform.lock.hcl

Lines changed: 116 additions & 111 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/complete/terraform/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.2
1+
3.2.0

deploy/complete/terraform/mushop-oci-services.tf

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,21 @@ resource "kubernetes_service_account" "wallet_extractor_sa" {
107107
name = "wallet-extractor-sa"
108108
namespace = kubernetes_namespace.mushop_namespace.id
109109
}
110+
secret {
111+
name = "wallet-extractor-sa-token"
112+
}
113+
114+
count = var.mushop_mock_mode_all ? 0 : 1
115+
}
116+
resource "kubernetes_secret" "wallet_extractor_sa" {
117+
metadata {
118+
name = "wallet-extractor-sa-token"
119+
namespace = kubernetes_namespace.mushop_namespace.id
120+
annotations = {
121+
"kubernetes.io/service-account.name" = kubernetes_service_account.wallet_extractor_sa.0.metadata.0.name
122+
}
123+
}
124+
type = "kubernetes.io/service-account-token"
110125

111126
count = var.mushop_mock_mode_all ? 0 : 1
112127
}
@@ -141,7 +156,7 @@ resource "kubernetes_job" "wallet_extractor_job" {
141156
args = ["kubectl create secret generic oadb-wallet --from-file=/wallet"]
142157
volume_mount {
143158
mount_path = "/var/run/secrets/kubernetes.io/serviceaccount"
144-
name = kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
159+
name = kubernetes_secret.wallet_extractor_sa.0.metadata.0.name # kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
145160
read_only = true
146161
}
147162
volume_mount {
@@ -151,9 +166,9 @@ resource "kubernetes_job" "wallet_extractor_job" {
151166
}
152167
}
153168
volume {
154-
name = kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
169+
name = kubernetes_secret.wallet_extractor_sa.0.metadata.0.name # kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
155170
secret {
156-
secret_name = kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
171+
secret_name = kubernetes_secret.wallet_extractor_sa.0.metadata.0.name # kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
157172
}
158173
}
159174
volume {

0 commit comments

Comments
 (0)