Skip to content

Commit 250cd73

Browse files
committed
Merge branch 'develop'
2 parents 413f267 + 56e7ba7 commit 250cd73

6 files changed

Lines changed: 8 additions & 7 deletions

File tree

Tiltfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if os.name == "nt":
3333
drive, path_without_drive = os.getcwd().split(":")
3434
data_absolute_path = os.path.join("//run/desktop/mnt/host/", drive, path_without_drive, data_relative_path).replace("\\","/").lower()
3535
use_named_volumes = ["mariadb"]
36-
elif k8s_context() == "minikube":
36+
elif k8s_context() == "minikube" or k8s_context() == "kind-kind":
3737
hostname = cfg.get("hostname", "")
3838
data_absolute_path = "//data/" + data_relative_path
3939
use_named_volumes = []
@@ -291,7 +291,8 @@ for object in decode_yaml_stream(traefik_yaml):
291291
traefik_crds.append(name + ":" + kind)
292292

293293
k8s_resource(new_name="traefik-crds", objects=traefik_crds, labels=["traefik"])
294-
k8s_resource(new_name="traefik-setup", objects=traefik_identifiers, resource_deps=["namespaces", "traefik-crds"], labels=["traefik"])
294+
agnostic_local_resource("wait-for-traefik-crd", cmd=["kubectl", "wait", "--for=condition=established", "--timeout=60s", "crd/ingressroutes.traefik.io"], resource_deps=["traefik-crds"], labels=["traefik"])
295+
k8s_resource(new_name="traefik-setup", objects=traefik_identifiers, resource_deps=["namespaces", "wait-for-traefik-crd"], labels=["traefik"])
295296
k8s_resource(workload="release-name-traefik", new_name="traefik", port_forwards=["443:8443", "80:8000"], resource_deps=["traefik-setup"], labels=["traefik"], links=[link("http://traefik.{}".format(base_domain), "FAF Traefik")])
296297

297298
postgres_yaml = helm_with_build_cache("infra/postgres", namespace="faf-infra", values=["config/local.yaml"])

apps/faf-legacy-deployment/scripts/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
implementation("org.eclipse.jgit:org.eclipse.jgit:7.6.0.202603022253-r")
1313
implementation("org.apache.commons:commons-compress:1.28.0")
1414
implementation("org.slf4j:slf4j-api:2.0.17")
15-
implementation("ch.qos.logback:logback-classic:1.5.32")
15+
implementation("ch.qos.logback:logback-classic:1.5.34")
1616
}
1717

1818
// Use the root level for files

apps/nodebb/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
- mountPath: /data/plugins
4343
name: plugins
4444
containers:
45-
- image: ghcr.io/nodebb/nodebb:4.7
45+
- image: ghcr.io/nodebb/nodebb:4.12
4646
imagePullPolicy: Always
4747
name: nodebb
4848
volumeMounts:

apps/ory-hydra/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
image:
22
repository: "oryd/hydra"
3-
tag: "v25.4.0"
3+
tag: "v26.2.0"
44
infisical-secret:
55
name: ory-hydra
66
cors:

cluster/argocd/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ name: argocd
33
version: 1.0.0
44
dependencies:
55
- name: argo-cd
6-
version: 9.4.17
6+
version: 9.5.20
77
repository: https://argoproj.github.io/argo-helm

infra/mongodb/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
image:
22
repository: "mongo"
3-
tag: "8.2.3"
3+
tag: "8.3.2"
44

55
infisical-secret:
66
name: mongodb

0 commit comments

Comments
 (0)