Skip to content
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

Jump to bottom

chore(kopia): rename kopia to kopia-b2 #1579

Merged
merged 1 commit into from
Nov 12, 2024
Merged

chore(kopia): rename kopia to kopia-b2 #1579

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
4 changes: 2 additions & 2 deletions kubernetes/main/apps/default/homepage/app/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ data:
- Filebrowser:
href: https://filebrowser.18b.haus
icon: filebrowser.png
- Kopia:
href: https://kopia.18b.haus
- Kopia (b2):
href: https://kopia-b2.18b.haus
icon: kopia.png
- Minio:
href: https://minio.18b.haus
Expand Down
16 changes: 8 additions & 8 deletions ...e/apps/default/kopia/app/helmrelease.yaml → ...ge/apps/default/kopia/b2/helmrelease.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: kopia
name: kopia-b2
spec:
interval: 2h
chart:
Expand All @@ -18,7 +18,7 @@ spec:

values:
controllers:
kopia:
kopia-b2:
annotations:
reloader.stakater.com/auto: "true"
containers:
Expand All @@ -28,7 +28,7 @@ spec:
tag: 0.17.0
envFrom:
- secretRef:
name: kopia-secret
name: kopia-b2-secret
args:
- server
- start
Expand Down Expand Up @@ -66,15 +66,15 @@ spec:
runAsUser: 0
service:
app:
controller: kopia
controller: kopia-b2
ports:
http:
port: 80
metrics:
port: 8080
serviceMonitor:
app:
serviceName: kopia
serviceName: kopia-b2
endpoints:
- port: metrics
scheme: http
Expand All @@ -86,15 +86,15 @@ spec:
className: internal
annotations:
nginx.ingress.kubernetes.io/auth-signin: |-
https://kopia.18b.haus/outpost.goauthentik.io/start?rd=$escaped_request_uri
https://kopia-b2.18b.haus/outpost.goauthentik.io/start?rd=$escaped_request_uri
nginx.ingress.kubernetes.io/auth-url: |-
http://authentik-outpost-proxy.identity.svc.cluster.local:9000/outpost.goauthentik.io/auth/nginx
nginx.ingress.kubernetes.io/auth-response-headers: |-
Set-Cookie,X-authentik-username,X-authentik-groups,X-authentik-email,X-authentik-name,X-authentik-uid
nginx.ingress.kubernetes.io/auth-snippet: |
proxy_set_header X-Forwarded-Host $http_host;
hosts:
- host: &host kopia.18b.haus
- host: &host kopia-b2.18b.haus
paths:
- path: /
service:
Expand All @@ -106,7 +106,7 @@ spec:
persistence:
config-file:
type: secret
name: kopia-repository-secret
name: kopia-b2-repository-secret
globalMounts:
- path: /app/config/repository.config
subPath: repository.config
Expand Down
0 ...apps/default/kopia/app/kustomization.yaml → .../apps/default/kopia/b2/kustomization.yaml
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions ...e/apps/default/kopia/app/secret.sops.yaml → ...ge/apps/default/kopia/b2/secret.sops.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Secret
metadata:
name: kopia-secret
name: kopia-b2-secret
stringData:
KOPIA_PASSWORD: ENC[AES256_GCM,data:DDtmZvAlq/b28A8y8ak1U1LHY7sh7M1X7bIf/tzJd+U=,iv:azpkCr+5NhjuI3bd7c+4NdMH+/DLid8bSVelMehL0CU=,tag:z2GVPVTbaedm/PNbf1SJHw==,type:str]
sops:
Expand All @@ -19,16 +19,16 @@ sops:
UFhCSExBK2w5K04xMnNtWXhGUjZ1S3cK4txYg7g9D/lMwEJe27w6GjRZ4od97VgB
DRRngPR7fiZb+ev1CWEjrIkpPPi7lcT/E9NQldS8RTeOoUQgfXo4Dg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-16T21:07:49Z"
mac: ENC[AES256_GCM,data:u1Y/N+B1pgTipv9e5VIPsvJtspTbJyKFvHvrdDFusPKK0KqcZrK1mtF7IFd6vTUZpOJHdynzYeHB4+HlPi0p+r/Cu8OheSkkmtYAkw7OD+qabb3x0hlvHj5S+3Q7mO2vD5zHX1iVQ6agndXRRHqR0Ggw7L0M5Pheewm8qg6lRRk=,iv:VOgMk/KleOqgXwV1u8CBk63i4rAZfns4Hr7YoiS8iac=,tag:RqseNzfzNfgypuwStacBMw==,type:str]
lastmodified: "2024-11-12T12:24:07Z"
mac: ENC[AES256_GCM,data:TIY0875nVPZGc/h0F+8PqbJnnFnC0nh1sqtJLKXYtp9nrTQBiwREqPK6PNBdGFjY7j5V8pV3FmW8XBDetp19Gg+NliIP2KysvQluCG5j+WTw/dOuNihUMcQa9YxkgqJEO6jk1HEg6Tl2YMONmvQy039H9aVev4jWkTim2e52CN0=,iv:0tivFffZRrwaFXRCk2WyQHRG9ckvIhTgpMOJ0GrZSvg=,tag:gxwDRzB+LjVzocoBZnJpUg==,type:str]
pgp: []
encrypted_regex: ^(data|stringData)$
version: 3.8.1
version: 3.9.0
---
apiVersion: v1
kind: Secret
metadata:
name: kopia-repository-secret
name: kopia-b2-repository-secret
stringData:
repository.config: ENC[AES256_GCM,data:yBiaWY0LG7jnFNlEyk4CIqKB5wJXYPpfWBdQC4aC3UZc9lgiHDDvAEIQbNqtmGnFSMv6T0Kx2zlNAzbakDyaGBuRsq36upxxhtWhyrHNSCdgmv2OtnRjrj9ePYQqTqqrbK5OlPkrrM89lm8G4fGDyuN/8Py3skR3/MwcsvB8BBB6vLYp8nBgy2cLpbSa9VMB9usD/BFY4EOtEklYWCre6+9ja/4Cq/8U9SMWaKXsCFWnZ08U42FGu9gfgTJj0sT4QOy5BtahzFHpUAZr3h+timLxMDGuqsWep6FmrGbutVGeOGN5LSQhgOfOuuMxXAw6/W/H2MpJUwhGrDFwlGvYU00OOBB5DTX6Lfz6hIMrMMlmricmPMKwIN4vsTWmZCe28Bd9vIBXAG1aq7SBS45wX86+pMIEyJjCiy9dAw6LW2729D3KgPYmft/4XAk632g0uazsQ9bJ9JAVb08kr7b78pJTRfMvoereMnAapRXVL8Rfv6cjqPCIBwNeLkLDFpvpuL76A1oEsF0CCMII+HqeXVzcigHK+3qu7rh+7W42G1i0EJudYJ+itNB7xY0EPfaim890fAaHs6aoNbaa8it70Ia3hUvA+M+EDZ4x4lPgSN2WfMOcOv2PH4i/vXmXnWfeBByuAub6cQITN5J+DW5C6RPs+QiT7Jt9N5U=,iv:ix6g9oAGtKzxb2Q0S6VTE+rxKxfs/4IZpiQj+ArvjAI=,tag:G0q+YQ+Lg6Ufhp9bJ+4IWA==,type:str]
sops:
Expand All @@ -46,8 +46,8 @@ sops:
UFhCSExBK2w5K04xMnNtWXhGUjZ1S3cK4txYg7g9D/lMwEJe27w6GjRZ4od97VgB
DRRngPR7fiZb+ev1CWEjrIkpPPi7lcT/E9NQldS8RTeOoUQgfXo4Dg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-16T21:07:49Z"
mac: ENC[AES256_GCM,data:u1Y/N+B1pgTipv9e5VIPsvJtspTbJyKFvHvrdDFusPKK0KqcZrK1mtF7IFd6vTUZpOJHdynzYeHB4+HlPi0p+r/Cu8OheSkkmtYAkw7OD+qabb3x0hlvHj5S+3Q7mO2vD5zHX1iVQ6agndXRRHqR0Ggw7L0M5Pheewm8qg6lRRk=,iv:VOgMk/KleOqgXwV1u8CBk63i4rAZfns4Hr7YoiS8iac=,tag:RqseNzfzNfgypuwStacBMw==,type:str]
lastmodified: "2024-11-12T12:24:07Z"
mac: ENC[AES256_GCM,data:TIY0875nVPZGc/h0F+8PqbJnnFnC0nh1sqtJLKXYtp9nrTQBiwREqPK6PNBdGFjY7j5V8pV3FmW8XBDetp19Gg+NliIP2KysvQluCG5j+WTw/dOuNihUMcQa9YxkgqJEO6jk1HEg6Tl2YMONmvQy039H9aVev4jWkTim2e52CN0=,iv:0tivFffZRrwaFXRCk2WyQHRG9ckvIhTgpMOJ0GrZSvg=,tag:gxwDRzB+LjVzocoBZnJpUg==,type:str]
pgp: []
encrypted_regex: ^(data|stringData)$
version: 3.8.1
version: 3.9.0
4 changes: 2 additions & 2 deletions kubernetes/storage/apps/default/kopia/ks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: &app kopia
name: &app kopia-b2
namespace: flux-system
spec:
targetNamespace: default
commonMetadata:
labels:
app.kubernetes.io/name: *app
path: ./kubernetes/storage/apps/default/kopia/app
path: ./kubernetes/storage/apps/default/kopia/b2
prune: true
sourceRef:
kind: GitRepository
Expand Down
8 changes: 4 additions & 4 deletions terraform/authentik/applications.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,11 @@ module "proxy-filebrowser" {
auth_groups = [authentik_group.admins.id]
}

module "proxy-kopia" {
module "proxy-kopia-b2" {
source = "./modules/proxy-application"
name = "Kopia"
name = "Kopia (b2)"
icon_url = "https://raw.githubusercontent.com/walkxcode/dashboard-icons/main/svg/kopia.svg"
slug = "kopia"
slug = "kopia-b2"
domain = "18b.haus"
authorization_flow = data.authentik_flow.default-authorization-flow.id
invalidation_flow = data.authentik_flow.default-provider-invalidation-flow.id
Expand Down Expand Up @@ -255,7 +255,7 @@ resource "authentik_outpost" "storage-proxy" {

protocol_providers = [
module.proxy-filebrowser.id,
module.proxy-kopia.id,
module.proxy-kopia-b2.id,
]

config = jsonencode({
Expand Down