deploy(dns): align l4 image and auth gate
This commit is contained in:
@@ -48,7 +48,7 @@ data:
|
|||||||
{
|
{
|
||||||
"FlowerCore": {
|
"FlowerCore": {
|
||||||
"Auth": {
|
"Auth": {
|
||||||
"Enabled": true,
|
"Enabled": false,
|
||||||
"Oidc": {
|
"Oidc": {
|
||||||
"Enabled": true,
|
"Enabled": true,
|
||||||
"Audience": "dns",
|
"Audience": "dns",
|
||||||
@@ -111,7 +111,7 @@ spec:
|
|||||||
fsGroup: 1654
|
fsGroup: 1654
|
||||||
containers:
|
containers:
|
||||||
- name: dns-web
|
- name: dns-web
|
||||||
image: localhost/fc-dns-web:v20260604-oidc-proper
|
image: localhost/fc-dns-web:v20260612-l4dns-a5d2849
|
||||||
imagePullPolicy: Never
|
imagePullPolicy: Never
|
||||||
securityContext:
|
securityContext:
|
||||||
readOnlyRootFilesystem: true
|
readOnlyRootFilesystem: true
|
||||||
@@ -149,7 +149,7 @@ spec:
|
|||||||
key: client_secret
|
key: client_secret
|
||||||
optional: true
|
optional: true
|
||||||
- name: FlowerCore__Auth__Enabled
|
- name: FlowerCore__Auth__Enabled
|
||||||
value: "true"
|
value: "false"
|
||||||
- name: FlowerCore__Auth__Oidc__Enabled
|
- name: FlowerCore__Auth__Oidc__Enabled
|
||||||
value: "true"
|
value: "true"
|
||||||
- name: FlowerCore__Auth__Oidc__Audience
|
- name: FlowerCore__Auth__Oidc__Audience
|
||||||
@@ -303,7 +303,7 @@ spec:
|
|||||||
fsGroup: 1654
|
fsGroup: 1654
|
||||||
containers:
|
containers:
|
||||||
- name: dns-acme-webhook
|
- name: dns-acme-webhook
|
||||||
image: localhost/fc-dns-acme-webhook:v202604290845
|
image: localhost/fc-dns-acme-webhook:v20260612-l4dns-a5d2849
|
||||||
imagePullPolicy: Never
|
imagePullPolicy: Never
|
||||||
securityContext:
|
securityContext:
|
||||||
readOnlyRootFilesystem: true
|
readOnlyRootFilesystem: true
|
||||||
|
|||||||
@@ -867,9 +867,9 @@ public sealed class FleetManifestLintTests
|
|||||||
{
|
{
|
||||||
var deployments = new[]
|
var deployments = new[]
|
||||||
{
|
{
|
||||||
(App: "fc-dns", Name: "dns-web", Slug: "dns", Secret: "dns-oidc-client"),
|
(App: "fc-dns", Name: "dns-web", Slug: "dns", Secret: "dns-oidc-client", AuthEnabled: "false"),
|
||||||
(App: "fc-media", Name: "fc-media-web", Slug: "media", Secret: "media-oidc-client"),
|
(App: "fc-media", Name: "fc-media-web", Slug: "media", Secret: "media-oidc-client", AuthEnabled: "true"),
|
||||||
(App: "fc-distribution", Name: "fc-distribution", Slug: "distribution", Secret: "distribution-oidc-client"),
|
(App: "fc-distribution", Name: "fc-distribution", Slug: "distribution", Secret: "distribution-oidc-client", AuthEnabled: "true"),
|
||||||
};
|
};
|
||||||
|
|
||||||
foreach (var expected in deployments)
|
foreach (var expected in deployments)
|
||||||
@@ -878,7 +878,7 @@ public sealed class FleetManifestLintTests
|
|||||||
.Single(document => document.Kind == "Deployment" && document.Name == expected.Name);
|
.Single(document => document.Kind == "Deployment" && document.Name == expected.Name);
|
||||||
var container = deployment.MainContainerMappings().Should().ContainSingle().Subject;
|
var container = deployment.MainContainerMappings().Should().ContainSingle().Subject;
|
||||||
|
|
||||||
EnvValue(container, "FlowerCore__Auth__Enabled").Should().Be("true");
|
EnvValue(container, "FlowerCore__Auth__Enabled").Should().Be(expected.AuthEnabled);
|
||||||
EnvValue(container, "FlowerCore__Auth__Oidc__Enabled").Should().Be("true");
|
EnvValue(container, "FlowerCore__Auth__Oidc__Enabled").Should().Be("true");
|
||||||
(EnvValue(container, "FlowerCore__Auth__Oidc__Audience") ?? EnvValue(container, "FlowerCore__Auth__Oidc__ClientId"))
|
(EnvValue(container, "FlowerCore__Auth__Oidc__Audience") ?? EnvValue(container, "FlowerCore__Auth__Oidc__ClientId"))
|
||||||
.Should()
|
.Should()
|
||||||
@@ -927,7 +927,7 @@ public sealed class FleetManifestLintTests
|
|||||||
var dnsPvc = AppDocuments("fc-dns")
|
var dnsPvc = AppDocuments("fc-dns")
|
||||||
.Single(document => document.Kind == "PersistentVolumeClaim" && document.Name == "dns-web-data");
|
.Single(document => document.Kind == "PersistentVolumeClaim" && document.Name == "dns-web-data");
|
||||||
|
|
||||||
ManifestNodeExtensions.Scalar(dnsContainer, "image").Should().Be("localhost/fc-dns-web:v20260604-oidc-proper");
|
ManifestNodeExtensions.Scalar(dnsContainer, "image").Should().Be("localhost/fc-dns-web:v20260612-l4dns-a5d2849");
|
||||||
dnsPvc.Scalar("spec", "storageClassName").Should().Be("longhorn");
|
dnsPvc.Scalar("spec", "storageClassName").Should().Be("longhorn");
|
||||||
dnsPvc.Scalar("spec", "resources", "requests", "storage").Should().Be("1Gi");
|
dnsPvc.Scalar("spec", "resources", "requests", "storage").Should().Be("1Gi");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user