mirror of
https://github.com/morten-olsen/homelab-operator.git
synced 2026-02-08 01:36:28 +01:00
Compare commits
3 Commits
v0.1.113
...
fix/auth-u
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cad527e644 | ||
|
|
ce2cebf77b | ||
|
|
3ae89e81bd |
@@ -18,6 +18,7 @@ import { RepoService } from '#bootstrap/repos/repos.ts';
|
||||
import { DestinationRule } from '#resources/istio/destination-rule/destination-rule.ts';
|
||||
import { NotReadyError } from '#utils/errors.ts';
|
||||
import { ExternalHttpService } from '../external-http-service.ts/external-http-service.ts';
|
||||
import { HttpService } from '../http-service/http-service.ts';
|
||||
|
||||
const specSchema = z.object({
|
||||
environment: z.string(),
|
||||
@@ -44,6 +45,7 @@ class AuthentikServer extends CustomResource<typeof specSchema> {
|
||||
#initSecret: Secret<InitSecretData>;
|
||||
#service: Service;
|
||||
#helmRelease: HelmRelease;
|
||||
#httpService: HttpService;
|
||||
#externalHttpService: ExternalHttpService;
|
||||
#destinationRule: DestinationRule;
|
||||
|
||||
@@ -72,6 +74,8 @@ class AuthentikServer extends CustomResource<typeof specSchema> {
|
||||
this.#destinationRule.on('changed', this.queueReconcile);
|
||||
|
||||
this.#externalHttpService = resourceService.get(ExternalHttpService, this.name, this.namespace);
|
||||
|
||||
this.#httpService = resourceService.get(HttpService, this.name, this.namespace);
|
||||
}
|
||||
|
||||
public get service() {
|
||||
@@ -253,6 +257,22 @@ class AuthentikServer extends CustomResource<typeof specSchema> {
|
||||
},
|
||||
});
|
||||
|
||||
await this.#httpService.ensure({
|
||||
metadata: {
|
||||
ownerReferences: [this.ref],
|
||||
},
|
||||
spec: {
|
||||
environment: this.spec.environment,
|
||||
subdomain: this.spec.subdomain || 'authentik',
|
||||
destination: {
|
||||
host: this.#service.hostname,
|
||||
port: {
|
||||
number: 80,
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
await this.#externalHttpService.ensure({
|
||||
metadata: {
|
||||
ownerReferences: [this.ref],
|
||||
|
||||
@@ -79,7 +79,7 @@ class OIDCClient extends CustomResource<typeof specSchema> {
|
||||
clientId: this.name,
|
||||
configuration: new URL(`/application/o/${this.appName}/.well-known/openid-configuration`, url).toString(),
|
||||
configurationIssuer: new URL(`/application/o/${this.appName}/`, url).toString(),
|
||||
authorization: new URL(`/application/o/${this.appName}/authorize/`, url).toString(),
|
||||
authorization: new URL(`/application/o/authorize/`, url).toString(),
|
||||
token: new URL(`/application/o/${this.appName}/token/`, url).toString(),
|
||||
userinfo: new URL(`/application/o/${this.appName}/userinfo/`, url).toString(),
|
||||
endSession: new URL(`/application/o/${this.appName}/end-session/`, url).toString(),
|
||||
|
||||
@@ -108,7 +108,7 @@ class PostgresCluster extends CustomResource<typeof specSchema> {
|
||||
containers: [
|
||||
{
|
||||
name: this.name,
|
||||
image: 'pgvector:pg17-trixie',
|
||||
image: 'pgvector/pgvector:pg17-trixie',
|
||||
ports: [{ containerPort: 5432, name: 'postgres' }],
|
||||
env: [
|
||||
{ name: 'POSTGRES_PASSWORD', valueFrom: { secretKeyRef: { name: secretName, key: 'password' } } },
|
||||
|
||||
Reference in New Issue
Block a user