diff --git a/values/atlantis/kustomize/beta/appsettings.json b/values/atlantis/kustomize/beta/appsettings.json index 2103d189..549e6584 100644 --- a/values/atlantis/kustomize/beta/appsettings.json +++ b/values/atlantis/kustomize/beta/appsettings.json @@ -71,7 +71,7 @@ "redis": "beta-atlantis-redis-master:6379", "objectStore": "https://atlantis.blob.core.windows.net", "connString": "Username=postgres;Password=secret;Host=localhost;Port=5432;Database=app;Pooling=true;", - "sorcerer" : "https://sorcerer.data.oceanbox.io", + "sorcerer" : "https://sorcerer.beta.oceanbox.io", "allowedOrigins": [ "https://maps.beta.oceanbox.io" ], diff --git a/values/sorcerer/kustomize/beta-ekman/appsettings.json b/values/sorcerer/kustomize/beta-ekman/appsettings.json new file mode 100644 index 00000000..f5a9ace3 --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/appsettings.json @@ -0,0 +1,77 @@ +{ + "oidc": { + "issuer": "https://auth.oceanbox.io/realms/oceanbox", + "authorization_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/auth", + "token_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/token", + "jwks_uri": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/certs", + "userinfo_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/userinfo", + "end_session_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/logout", + "device_authorization_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/auth/device", + "clientId": "sorcerer", + "clientSecret": "", + "scopes": [ + "openid", + "email", + "offline_access", + "profile" + ], + "audiences": [ + "atlantis", + "atlantis_dev", + "sorcerer", + "sorcerer_dev" + ] + }, + "sso": { + "cookieDomain": ".oceanbox.io", + "cookieName": ".obx.beta", + "ttl": 12.0, + "signedOutRedirectUri": "https://maps.beta.oceanbox.io", + "realm": "atlantis", + "environment": "prod", + "keyStore": { + "kind": "azure", + "uri": "https://atlantis.blob.core.windows.net", + "key": "dataprotection-keys" + }, + "keyVault": { + "kind": "azure", + "uri": "https://atlantisvault.vault.azure.net", + "key": "dataencryption-keys" + } + }, + "plainAuthUsers": [], + "fga": { + "apiUrl": "https://openfga.srv.oceanbox.io", + "apiKey": "", + "storeId": "01JKTZXMP7ANN4GG2P5W8Y56M6", + "modelId": "01JKTZYMCZZBVSBG66W27XMW0A" + }, + "sentryUrl": "https://5e6e3584098dc006de18038cf85d2cbe@o4509530141622272.ingest.de.sentry.io/4509547350065232", + "redis": "localhost:6379,user=default,password=secret", + "allowedOrigins": [ + "http://localhost:8085", + "http://localhost:8080", + "https://localhost:8080", + "https://sorcerer.data.oceanbox.io", + "https://sorcerer.beta.oceanbox.io", + "https://sorcerer.ekman.oceanbox.io", + "https://sorcerer.local.oceanbox.io:8080", + "https://atlantis.local.oceanbox.io:8080", + "https://maps.oceanbox.io", + "https://maps.beta.oceanbox.io", + "https://atlantis.beta.oceanbox.io", + "https://jonas-atlantis.dev.oceanbox.io", + "https://stig-atlantis.dev.oceanbox.io", + "https://prod-sorcerer.ekman.oceanbox.io", + "http://prod-sorcerer.ekman.oceanbox.io" + ], + "appName": "sorcerer", + "appEnv": "prod", + "appNamespace": "beta-sorcerer", + "appVersion": "0.0.0", + "otelCollector": "http://10.255.241.12:4317", + "archiveSvc": "https://maps.beta.oceanbox.io", + "dataDir": "/data/archives", + "cacheDir": "/data/archives/cache/prod" +} diff --git a/values/sorcerer/kustomize/beta-ekman/configurations.yaml b/values/sorcerer/kustomize/beta-ekman/configurations.yaml new file mode 100644 index 00000000..3131d2c8 --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/configurations.yaml @@ -0,0 +1,20 @@ +apiVersion: dapr.io/v1alpha1 +kind: Component +metadata: + name: configstore +spec: + type: configuration.redis + version: v1 + metadata: + - name: redisHost + value: beta-sorcerer-redis:6379 + - name: redisUsername + value: default + - name: redisPassword + secretKeyRef: + name: beta-sorcerer-redis + key: redis-password + - name: redisDB + value: "1" +scopes: + - beta-sorcerer diff --git a/values/sorcerer/kustomize/beta-ekman/deployment_patch.yaml b/values/sorcerer/kustomize/beta-ekman/deployment_patch.yaml new file mode 100644 index 00000000..c2860a1d --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/deployment_patch.yaml @@ -0,0 +1,14 @@ +# - op: replace +# path: /spec/template/spec/containers/0/volumeMounts/0/mountPath +# value: /data +- op: add + path: /spec/template/spec/containers/0/envFrom/- + value: + secretRef: + name: azure-keyvault +- op: add + path: /spec/template/spec/containers/0/envFrom/- + value: + secretRef: + name: prod-sorcerer-env + diff --git a/values/sorcerer/kustomize/beta-ekman/keyvault.yaml b/values/sorcerer/kustomize/beta-ekman/keyvault.yaml new file mode 100644 index 00000000..a8b2ce2a --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/keyvault.yaml @@ -0,0 +1,22 @@ +apiVersion: dapr.io/v1alpha1 +kind: Component +metadata: + name: azure-keyvault +spec: + type: secretstores.azure.keyvault + version: v1 + metadata: + - name: vaultName + value: atlantisvault + - name: azureTenantId + secretKeyRef: + name: azure-keyvault + key: AZURE_TENANT_ID + - name: azureClientId + secretKeyRef: + name: azure-keyvault + key: AZURE_CLIENT_ID + - name: azureClientSecret + secretKeyRef: + name: azure-keyvault + key: AZURE_CLIENT_SECRET \ No newline at end of file diff --git a/values/sorcerer/kustomize/beta-ekman/kustomization.yaml b/values/sorcerer/kustomize/beta-ekman/kustomization.yaml new file mode 100644 index 00000000..054f2b14 --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/kustomization.yaml @@ -0,0 +1,23 @@ +generatorOptions: + disableNameSuffixHash: true +configMapGenerator: +- name: beta-sorcerer-appsettings + files: + - appsettings.json +patches: +- target: + group: apps + version: v1 + kind: Deployment + path: deployment_patch.yaml +resources: +- ../base +- pv.yaml +- pvc.yaml +- secrets.yaml +- configurations.yaml +- keyvault.yaml +- rbac.yaml +- secretstore.yaml +- statestore.yaml +- tracing.yaml \ No newline at end of file diff --git a/values/sorcerer/kustomize/beta-ekman/pv.yaml b/values/sorcerer/kustomize/beta-ekman/pv.yaml new file mode 100644 index 00000000..8ea2acf6 --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/pv.yaml @@ -0,0 +1,22 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: pv-beta-sorcerer-ceph-archives +spec: + accessModes: + - ReadWriteMany + capacity: + storage: 1Gi + csi: + driver: rook-ceph.cephfs.csi.ceph.com + nodeStageSecretRef: + name: rook-csi-cephfs-node + namespace: rook-ceph + volumeAttributes: + clusterID: rook-ceph + fsName: data + rootPath: / + staticVolume: "true" + volumeHandle: pv-beta-sorcerer-ceph-archives + persistentVolumeReclaimPolicy: Retain + volumeMode: Filesystem diff --git a/values/sorcerer/kustomize/beta-ekman/pvc.yaml b/values/sorcerer/kustomize/beta-ekman/pvc.yaml new file mode 100644 index 00000000..b949575b --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/pvc.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: beta-sorcerer-ceph-archives +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: 1Gi + storageClassName: "" + volumeMode: Filesystem + volumeName: pv-beta-sorcerer-ceph-archives +status: + accessModes: + - ReadWriteMany + capacity: + storage: 1Gi diff --git a/values/sorcerer/kustomize/beta-ekman/rbac.yaml b/values/sorcerer/kustomize/beta-ekman/rbac.yaml new file mode 100644 index 00000000..188ce09a --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/rbac.yaml @@ -0,0 +1,39 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: beta-sorcerer + namespace: beta-sorcerer +rules: +- apiGroups: + - "" + resourceNames: + - beta-sorcerer-appsettings + resources: + - configmaps + verbs: + - get + - watch +- apiGroups: + - "" + resourceNames: + - azure-keyvault + - beta-sorcerer-redis + resources: + - secrets + verbs: + - get + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: beta-sorcerer + namespace: beta-sorcerer +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: beta-sorcerer +subjects: +- kind: ServiceAccount + name: beta-sorcerer + namespace: beta-sorcerer diff --git a/values/sorcerer/kustomize/beta-ekman/secrets.yaml b/values/sorcerer/kustomize/beta-ekman/secrets.yaml new file mode 100644 index 00000000..7f187fd9 --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/secrets.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Secret +metadata: + name: beta-sorcerer-env +type: Opaque +data: +--- +apiVersion: v1 +kind: Secret +metadata: + annotations: + kyverno/clone: "true" + name: azure-keyvault +type: Opaque +data: diff --git a/values/sorcerer/kustomize/beta-ekman/secretstore.yaml b/values/sorcerer/kustomize/beta-ekman/secretstore.yaml new file mode 100644 index 00000000..06559c56 --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/secretstore.yaml @@ -0,0 +1,10 @@ +apiVersion: dapr.io/v1alpha1 +kind: Component +metadata: + name: secretstore +spec: + type: secretstores.kubernetes + version: v1 + metadata: + - name: defaultNamespace + value: prod-sorcerer \ No newline at end of file diff --git a/values/sorcerer/kustomize/beta-ekman/statestore.yaml b/values/sorcerer/kustomize/beta-ekman/statestore.yaml new file mode 100644 index 00000000..1a6f2853 --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/statestore.yaml @@ -0,0 +1,22 @@ +apiVersion: dapr.io/v1alpha1 +kind: Component +metadata: + name: statestore +spec: + type: state.redis + version: v1 + metadata: + - name: redisHost + value: beta-sorcerer-redis:6379 + - name: redisUsername + value: default + - name: redisPassword + secretKeyRef: + name: beta-sorcerer-redis + key: redis-password + - name: actorStateStore + value: "true" + - name: redisDB + value: "0" +scopes: + - beta-sorcerer diff --git a/values/sorcerer/kustomize/beta-ekman/tracing.yaml b/values/sorcerer/kustomize/beta-ekman/tracing.yaml new file mode 100644 index 00000000..4c4c318c --- /dev/null +++ b/values/sorcerer/kustomize/beta-ekman/tracing.yaml @@ -0,0 +1,11 @@ +apiVersion: dapr.io/v1alpha1 +kind: Configuration +metadata: + name: tracing +spec: + tracing: + samplingRate: "1" + otel: + endpointAddress: "10.255.241.12:4317" + protocol: grpc + isSecure: false diff --git a/values/sorcerer/manifests/sorcerer.yaml b/values/sorcerer/manifests/sorcerer.yaml index 5f338e1b..e20d07e8 100644 --- a/values/sorcerer/manifests/sorcerer.yaml +++ b/values/sorcerer/manifests/sorcerer.yaml @@ -27,7 +27,7 @@ spec: value: {{ .Values.sorcerer.env }} - name: HELMFILE_FILE_PATH value: sorcerer.yaml.gotmpl - - repoURL: https://gitlab.com/oceanbox/manifests.git + - repoURL: https://git.oceanbox.io/platform/manifests.git targetRevision: main ref: values ignoreDifferences: diff --git a/values/sorcerer/values/values-beta.yaml b/values/sorcerer/values/values-beta.yaml new file mode 100644 index 00000000..4db949b9 --- /dev/null +++ b/values/sorcerer/values/values-beta.yaml @@ -0,0 +1,113 @@ +replicaCount: 1 + +image: + repository: git.oceanbox.io/oceanbox/poseidon/sorcerer + tag: a0e383e7-debug + +podAnnotations: + dapr.io/enabled: "true" + dapr.io/app-id: "beta-sorcerer" + dapr.io/app-port: "8085" + dapr.io/api-token-secret: "dapr-api-token" + dapr.io/config: "tracing" + dapr.io/app-protocol: "http" + dapr.io/log-as-json: "true" + dapr.io/sidecar-cpu-request: "10m" + dapr.io/sidecar-memory-request: "50Mi" + # dapr.io/sidecar-cpu-limit: "300m" + # dapr.io/sidecar-memory-limit: "1000Mi" + +env: + - name: APP_VERSION + value: "4.16.3-beta" + - name: LOG_LEVEL + value: "1" + - name: REDIS_USER + value: default + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: beta-sorcerer-redis + key: redis-password + - name: DAPR_API_TOKEN + valueFrom: + secretKeyRef: + name: dapr-api-token + key: token + +ingress: + enabled: true + annotations: + cert-manager.io/cluster-issuer: letsencrypt-production + nginx.ingress.kubernetes.io/affinity: "cookie" + nginx.ingress.kubernetes.io/session-cookie-name: "http-affinity" + nginx.ingress.kubernetes.io/session-cookie-expires: "86400" + nginx.ingress.kubernetes.io/session-cookie-max-age: "86400" + hosts: + - host: sorcerer.beta.oceanbox.io + paths: + - path: / + pathType: ImplementationSpecific + internal: + - path: /internal + pathType: ImplementationSpecific + - path: /dapr + pathType: ImplementationSpecific + - path: /actors + pathType: ImplementationSpecific + - path: /job + pathType: ImplementationSpecific + - path: /events + pathType: ImplementationSpecific + - path: /metrics + pathType: ImplementationSpecific + tls: + - hosts: + - sorcerer.beta.oceanbox.io + secretName: beta-sorcerer-tls + +persistence: + enabled: true + existingClaim: beta-sorcerer-ceph-archives + +redis: + enabled: true + size: 1Gi + storageClass: "cephfs" + backup: + enabled: true + secret: + name: "beta-sorcerer-redis" + key: "redis-password" + resources: + cpu: 100m + memory: 128Mi + +affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: "topology.kubernetes.io/group" + operator: In + values: + - srv + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: "app.kubernetes.io/name" + operator: In + values: + - sorcerer + - key: "app.kubernetes.io/instance" + operator: In + values: + - beta-sorcerer + topologyKey: "kubernetes.io/hostname" + +diagrid-dashboard: + enabled: false + statestore: + scope: beta-sorcerer + redis: beta-sorcerer-redis