From dd139ddbc1fb84c67a0f8e408c3b076fdc7b4fb9 Mon Sep 17 00:00:00 2001 From: Andres Date: Fri, 23 Aug 2024 17:39:44 -0400 Subject: [PATCH] Argocd and Helm support (#1) --- .gitignore | 2 + .gitmodules | 3 + _infra/argocd/apps.yaml | 39 ++++ _infra/argocd/jobs.yaml | 173 ++++++++++++++++++ _infra/bin/build-push-svc.sh | 5 +- _infra/bin/build-push-web.sh | 5 +- _infra/bin/deploy-svc.sh | 5 - _infra/bin/deploy-web.sh | 5 - _infra/bin/deploy.sh | 20 -- _infra/bin/helm-argocd/del-argo-helm.sh | 4 + _infra/bin/helm-argocd/setup-argo-helm.sh | 5 + _infra/bin/helm-local/build-svc.sh | 5 + _infra/bin/helm-local/build-web.sh | 5 + _infra/bin/helm-local/install.sh | 7 + _infra/bin/helm-oci/build-svc.sh | 4 + _infra/bin/helm-oci/build-web.sh | 4 + _infra/bin/helm-oci/install.sh | 7 + _infra/bin/helm-oci/pkg.sh | 5 + _infra/helm | 1 + _infra/manifests/prometheus.yaml | 15 -- _infra/manifests/todo-web-deployment.yaml | 36 ---- _infra/manifests/todo-web-ingress.yaml | 20 -- _infra/manifests/todo-web-service.yaml | 14 -- _infra/manifests/todosvc-deployment.yaml | 55 ------ _infra/manifests/todosvc-ingress.yaml | 20 -- _infra/manifests/todosvc-service.yaml | 14 -- todo-svc/Dockerfile | 4 +- .../java/com/coeux/todo/TodoApplication.java | 1 + todo-web/src/components/SideMenu.js | 2 +- todo-web/src/components/TopBar.js | 2 +- todo-web/src/index.js | 2 +- 31 files changed, 276 insertions(+), 213 deletions(-) create mode 100644 .gitmodules create mode 100644 _infra/argocd/apps.yaml create mode 100644 _infra/argocd/jobs.yaml delete mode 100755 _infra/bin/deploy-svc.sh delete mode 100755 _infra/bin/deploy-web.sh delete mode 100755 _infra/bin/deploy.sh create mode 100755 _infra/bin/helm-argocd/del-argo-helm.sh create mode 100755 _infra/bin/helm-argocd/setup-argo-helm.sh create mode 100755 _infra/bin/helm-local/build-svc.sh create mode 100755 _infra/bin/helm-local/build-web.sh create mode 100755 _infra/bin/helm-local/install.sh create mode 100755 _infra/bin/helm-oci/build-svc.sh create mode 100755 _infra/bin/helm-oci/build-web.sh create mode 100755 _infra/bin/helm-oci/install.sh create mode 100755 _infra/bin/helm-oci/pkg.sh create mode 160000 _infra/helm delete mode 100644 _infra/manifests/prometheus.yaml delete mode 100644 _infra/manifests/todo-web-deployment.yaml delete mode 100644 _infra/manifests/todo-web-ingress.yaml delete mode 100644 _infra/manifests/todo-web-service.yaml delete mode 100644 _infra/manifests/todosvc-deployment.yaml delete mode 100644 _infra/manifests/todosvc-ingress.yaml delete mode 100644 _infra/manifests/todosvc-service.yaml diff --git a/.gitignore b/.gitignore index 8a70d0a..eae79b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ HELP.md +*.tgz **/target/ **/backup/ *.bak @@ -10,6 +11,7 @@ HELP.md **/id/*.json tempo-data *.bkp +*.private _infra/manifests/deploy.yaml ### STS ### .apt_generated diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..255491b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "_infra/helm"] + path = _infra/helm + url = https://github.com/andrescosta/todo-charts diff --git a/_infra/argocd/apps.yaml b/_infra/argocd/apps.yaml new file mode 100644 index 0000000..aecc518 --- /dev/null +++ b/_infra/argocd/apps.yaml @@ -0,0 +1,39 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: todosvc +spec: + destination: + name: '' + namespace: default + server: https://kubernetes.default.svc + source: + path: '' + repoURL: https://andrescosta.github.io/todo-charts + targetRevision: '>=0.4.0' + chart: todo-svc-jobico + syncPolicy: + automated: {} + sources: [] + project: default +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: todoweb +spec: + destination: + name: '' + namespace: default + server: https://kubernetes.default.svc + source: + path: '' + repoURL: https://andrescosta.github.io/todo-charts + targetRevision: '*' + chart: todo-web-jobico + sources: [] + project: default + syncPolicy: + automated: + prune: false + selfHeal: false diff --git a/_infra/argocd/jobs.yaml b/_infra/argocd/jobs.yaml new file mode 100644 index 0000000..0e6c0ae --- /dev/null +++ b/_infra/argocd/jobs.yaml @@ -0,0 +1,173 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: svc-builder-pvc +spec: + accessModes: + - ReadWriteOnce + storageClassName: nfs-csi + resources: + requests: + storage: 1Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: web-builder-pvc +spec: + accessModes: + - ReadWriteOnce + storageClassName: nfs-csi + resources: + requests: + storage: 1Gi +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: svc-builder +spec: + template: + spec: + imagePullSecrets: + - name: reg-cred-secret + securityContext: + runAsUser: 1000 + runAsGroup: 1000 + fsGroup: 1000 + initContainers: + - name: init-svc + image: reg.jobico.org/buildah + command: + - /script/build.sh + - init + - --repository=https://github.com/andrescosta/todo-jobico-cloud + - --branch=argocd-helm + - --build-dir=todo-svc/ + - --registry=reg.jobico.org + - --image-name=todosvc + - --current-version=1.1 + - --work-dir=/repo + - --helm-repository=https://oauth2:{token}@github.com/andrescosta/todo-charts + - --helm-branch=main + - --helm-chart=todo-svc-jobico + - --helm-version=0.4 + - --git-user=builder + - --git-email=builder@git + - --frequency=30 + - --token-file=/token/token_git_hub.private + - --first-build + - --verbose + volumeMounts: + - name: builder-vol + mountPath: "/repo" + - name: script + mountPath: "/script" + - name: github-token + mountPath: /token + containers: + - name: svc-builder + image: reg.jobico.org/buildah + securityContext: + privileged: true + command: + - /repo/todo-svc-jobico.sh + volumeMounts: + - name: script + mountPath: "/script" + - name: builder-vol + mountPath: "/repo" + - name: ca + mountPath: "/etc/containers/certs.d/reg.jobico.org" + - name: github-token + mountPath: /token + volumes: + - name: script + configMap: + name: build-map + defaultMode: 0050 + - name: builder-vol + persistentVolumeClaim: + claimName: svc-builder-pvc + - name: ca + configMap: + name: kube-root-ca.crt + - name: github-token + secret: + secretName: github-token + restartPolicy: Never +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: web-builder +spec: + template: + spec: + imagePullSecrets: + - name: reg-cred-secret + securityContext: + runAsUser: 1000 + runAsGroup: 1000 + fsGroup: 1000 + initContainers: + - name: init-web + image: reg.jobico.org/buildah + command: + - /script/build.sh + - init + - --repository=https://github.com/andrescosta/todo-jobico-cloud + - --branch=argocd-helm + - --build-dir=todo-web/ + - --registry=reg.jobico.org + - --image-name=todoweb + - --current-version=1.1 + - --work-dir=/repo + - --helm-repository=https://oauth2:{token}@github.com/andrescosta/todo-charts + - --helm-branch=main + - --helm-chart=todo-web-jobico + - --helm-version=0.4 + - --git-user=builder + - --git-email=builder@git + - --frequency=30 + - --token-file=/token/token_git_hub.private + - --first-build + - --verbose + volumeMounts: + - name: script + mountPath: "/script" + - name: builder-vol + mountPath: "/repo" + - name: github-token + mountPath: /token + containers: + - name: web-builder + image: reg.jobico.org/buildah + securityContext: + privileged: true + command: + - /repo/todo-web-jobico.sh + volumeMounts: + - name: script + mountPath: "/script" + - name: builder-vol + mountPath: "/repo" + - name: ca + mountPath: "/etc/containers/certs.d/reg.jobico.org" + - name: github-token + mountPath: /token + volumes: + - name: script + configMap: + name: build-map + defaultMode: 0050 + - name: builder-vol + persistentVolumeClaim: + claimName: web-builder-pvc + - name: ca + configMap: + name: kube-root-ca.crt + - name: github-token + secret: + secretName: github-token + restartPolicy: Never \ No newline at end of file diff --git a/_infra/bin/build-push-svc.sh b/_infra/bin/build-push-svc.sh index 49b4ead..427b4c8 100755 --- a/_infra/bin/build-push-svc.sh +++ b/_infra/bin/build-push-svc.sh @@ -1,2 +1,3 @@ -docker build ../../todo-svc/ -t reg.jobico.org/todosvc:latest -docker push reg.jobico.org/todosvc:latest +version=$1 +docker build ../../todo-svc/ -t reg.jobico.org/todosvc:$version +docker push reg.jobico.org/todosvc:$version diff --git a/_infra/bin/build-push-web.sh b/_infra/bin/build-push-web.sh index 94cd8ec..8410064 100755 --- a/_infra/bin/build-push-web.sh +++ b/_infra/bin/build-push-web.sh @@ -1,2 +1,3 @@ -docker build ../../todo-web/ -t reg.jobico.org/todoweb:latest -docker push reg.jobico.org/todoweb:latest \ No newline at end of file +version=${1:-$(date +"%Y%m%d%H%M%S")} +docker build ../../todo-web/ -t reg.jobico.org/todoweb:$version +docker push reg.jobico.org/todoweb:$version diff --git a/_infra/bin/deploy-svc.sh b/_infra/bin/deploy-svc.sh deleted file mode 100755 index 84f8474..0000000 --- a/_infra/bin/deploy-svc.sh +++ /dev/null @@ -1,5 +0,0 @@ -./build-push-svc.sh - -cat ../manifests/todosvc-deployment.yaml \ - | sed "s/{version}/$(date +"%Y%m%d%H%M%S")/"\ - | kubectl apply -f - diff --git a/_infra/bin/deploy-web.sh b/_infra/bin/deploy-web.sh deleted file mode 100755 index 4cf8420..0000000 --- a/_infra/bin/deploy-web.sh +++ /dev/null @@ -1,5 +0,0 @@ -./build-push-web.sh - -cat ../manifests/todo-web-deployment.yaml \ - | sed "s/{version}/$(date +"%Y%m%d%H%M%S")/"\ - | kubectl apply -f - diff --git a/_infra/bin/deploy.sh b/_infra/bin/deploy.sh deleted file mode 100755 index b295faa..0000000 --- a/_infra/bin/deploy.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -deploy_file_name="deploy.yaml" -deploy_full_path="../manifests/$deploy_file_name" - -./build-push-svc.sh -./build-push-web.sh - -if [ -f $deploy_full_path ]; then - kubectl delete -f $deploy_full_path - rm $deploy_full_path -fi - -awk -v date="$timestamp" ' - FNR==1 && NR!=1 {print "---"} - {gsub(/{version}/, date)} - {print} -' ../manifests/*.yaml > $deploy_full_path - -kubectl apply -f $deploy_full_path \ No newline at end of file diff --git a/_infra/bin/helm-argocd/del-argo-helm.sh b/_infra/bin/helm-argocd/del-argo-helm.sh new file mode 100755 index 0000000..057519b --- /dev/null +++ b/_infra/bin/helm-argocd/del-argo-helm.sh @@ -0,0 +1,4 @@ +pushd ../ +kubectl delete -f ../argocd/jobs.yaml +kubectl delete -f ../argocd/apps.yaml -n argocd +popd diff --git a/_infra/bin/helm-argocd/setup-argo-helm.sh b/_infra/bin/helm-argocd/setup-argo-helm.sh new file mode 100755 index 0000000..71f41d5 --- /dev/null +++ b/_infra/bin/helm-argocd/setup-argo-helm.sh @@ -0,0 +1,5 @@ +pushd ../ +kubectl create secret generic github-token --from-file=../id/token_git_hub.private +kubectl apply -f ../argocd/jobs.yaml +kubectl apply -f ../argocd/apps.yaml -n argocd +popd diff --git a/_infra/bin/helm-local/build-svc.sh b/_infra/bin/helm-local/build-svc.sh new file mode 100755 index 0000000..06316a9 --- /dev/null +++ b/_infra/bin/helm-local/build-svc.sh @@ -0,0 +1,5 @@ +pushd ../ +version=$(date +"%Y%m%d%H%M%S") +./build-push-svc.sh $version +helm upgrade todosvc ../helm/charts/todo-svc-jobico/ --set=image.tag=$version +popd diff --git a/_infra/bin/helm-local/build-web.sh b/_infra/bin/helm-local/build-web.sh new file mode 100755 index 0000000..294d21c --- /dev/null +++ b/_infra/bin/helm-local/build-web.sh @@ -0,0 +1,5 @@ +pushd ../ +version=$(date +"%Y%m%d%H%M%S") +./build-push-web.sh $version +helm upgrade todoweb ../helm/charts/todo-web-jobico/ --set=image.tag=$version +popd \ No newline at end of file diff --git a/_infra/bin/helm-local/install.sh b/_infra/bin/helm-local/install.sh new file mode 100755 index 0000000..458302b --- /dev/null +++ b/_infra/bin/helm-local/install.sh @@ -0,0 +1,7 @@ +pushd ../ +version=$(date +"%Y%m%d%H%M%S") +./build-push-svc.sh $version +./build-push-web.sh $version +helm install todosvc ../helm/charts/todo-svc-jobico/ --set=image.tag=$version +helm install todoweb ../helm/charts/todo-web-jobico/ --set=image.tag=$version +popd diff --git a/_infra/bin/helm-oci/build-svc.sh b/_infra/bin/helm-oci/build-svc.sh new file mode 100755 index 0000000..0acc81e --- /dev/null +++ b/_infra/bin/helm-oci/build-svc.sh @@ -0,0 +1,4 @@ +pushd ../ +./build-push-svc.sh 1.0 +popd +helm upgrade todosvc oci://reg.jobico.org/helm-charts/todo-svc-jobico diff --git a/_infra/bin/helm-oci/build-web.sh b/_infra/bin/helm-oci/build-web.sh new file mode 100755 index 0000000..478fde2 --- /dev/null +++ b/_infra/bin/helm-oci/build-web.sh @@ -0,0 +1,4 @@ +pushd ../ +./build-push-web.sh 1.0 +popd +helm upgrade todoweb oci://reg.jobico.org/helm-charts/todo-web-jobico diff --git a/_infra/bin/helm-oci/install.sh b/_infra/bin/helm-oci/install.sh new file mode 100755 index 0000000..7345bfb --- /dev/null +++ b/_infra/bin/helm-oci/install.sh @@ -0,0 +1,7 @@ +version=1.0 +pushd ../ +./build-push-web.sh $version +./build-push-svc.sh $version +popd +helm install todosvc oci://reg.jobico.org/helm-charts/todo-svc-jobico --set mode.dev.enabled=true --set=image.tag=$version +helm install todoweb oci://reg.jobico.org/helm-charts/todo-web-jobico --set mode.dev.enabled=true --set=image.tag=$version \ No newline at end of file diff --git a/_infra/bin/helm-oci/pkg.sh b/_infra/bin/helm-oci/pkg.sh new file mode 100755 index 0000000..e525712 --- /dev/null +++ b/_infra/bin/helm-oci/pkg.sh @@ -0,0 +1,5 @@ +version=1.0 +helm package ../../helm/charts/todo-web-jobico/ -d ../../charts --version=$version --app-version=$version +helm package ../../helm/charts/todo-svc-jobico/ -d ../../charts --version=$version --app-version=$version +helm push ../../charts/todo-svc-jobico-${version}.tgz oci://reg.jobico.org/helm-charts +helm push ../../charts/todo-web-jobico-${version}.tgz oci://reg.jobico.org/helm-charts diff --git a/_infra/helm b/_infra/helm new file mode 160000 index 0000000..b98ce1f --- /dev/null +++ b/_infra/helm @@ -0,0 +1 @@ +Subproject commit b98ce1fa171982db3847e1a164e7e08176054688 diff --git a/_infra/manifests/prometheus.yaml b/_infra/manifests/prometheus.yaml deleted file mode 100644 index eda0235..0000000 --- a/_infra/manifests/prometheus.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: obs-todosvc - labels: - release: kube-prometheus-stack -spec: - selector: - matchLabels: - app: todosvc - podMetricsEndpoints: - - port: svc - path: /actuator/prometheus - scheme: http - interval: 15s diff --git a/_infra/manifests/todo-web-deployment.yaml b/_infra/manifests/todo-web-deployment.yaml deleted file mode 100644 index 4b12518..0000000 --- a/_infra/manifests/todo-web-deployment.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: todo-web - name: todoweb -spec: - replicas: 1 - selector: - matchLabels: - app: todo-web - template: - metadata: - labels: - app: todo-web - annotations: - jobico-ver: "{version}" - spec: - imagePullSecrets: - - name: reg-cred-secret - containers: - - image: reg.jobico.org/todoweb:latest - imagePullPolicy: Always - #livenessProbe: - # exec: - # command: - # - curl -f http://localhost:3000/ || exit 1 - # failureThreshold: 2 - # periodSeconds: 60 - # timeoutSeconds: 10 - name: todoweb - ports: - - containerPort: 3000 - hostPort: 3000 - protocol: TCP - restartPolicy: Always \ No newline at end of file diff --git a/_infra/manifests/todo-web-ingress.yaml b/_infra/manifests/todo-web-ingress.yaml deleted file mode 100644 index 77f00eb..0000000 --- a/_infra/manifests/todo-web-ingress.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: todoweb -spec: - tls: - - hosts: - - todo.jobico.org - secretName: certs-secret - rules: - - host: todo.jobico.org - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: todoweb - port: - number: 3000 \ No newline at end of file diff --git a/_infra/manifests/todo-web-service.yaml b/_infra/manifests/todo-web-service.yaml deleted file mode 100644 index 42cf1b5..0000000 --- a/_infra/manifests/todo-web-service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: todo-web - name: todoweb -spec: - ports: - - name: "3000" - port: 3000 - targetPort: 3000 - selector: - app: todo-web - type: LoadBalancer \ No newline at end of file diff --git a/_infra/manifests/todosvc-deployment.yaml b/_infra/manifests/todosvc-deployment.yaml deleted file mode 100644 index 82b838a..0000000 --- a/_infra/manifests/todosvc-deployment.yaml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: todosvc - name: todosvc -spec: - replicas: 1 - selector: - matchLabels: - app: todosvc - template: - metadata: - labels: - app: todosvc - annotations: - jobico-ver: "{version}" - spec: - imagePullSecrets: - - name: reg-cred-secret - containers: - - env: - - name: SPRING_PROFILES_ACTIVE - value: devk8s - - name: PYROSCOPE_AGENT_ENABLED - value: "true" - - name: PYROSCOPE_APPLICATION_NAME - value: "todo-svc" - - name: PYROSCOPE_FORMAT - value: "jfr" - - name: PYROSCOPE_PROFILING_INTERVAL - value: "10ms" - - name: PYROSCOPE_PROFILER_EVENT - value: "itimer" - - name: PYROSCOPE_PROFILER_LOCK - value: "1" - - name: PYROSCOPE_PROFILER_ALLOC - value: "100k" - - name: PYROSCOPE_UPLOAD_INTERVAL - value: "10s" - - name: PYROSCOPE_LOG_LEVEL - value: "info" - - name: PYROSCOPE_LABELS - value: "todo-svc.jobico.org" - - name: PYROSCOPE_SERVER_ADDRESS - value: "http://pyroscope.obs.svc.cluster.local:4040" - image: reg.jobico.org/todosvc:latest - imagePullPolicy: Always - name: todosvc - ports: - - containerPort: 8080 - hostPort: 8080 - protocol: TCP - name: svc - restartPolicy: Always \ No newline at end of file diff --git a/_infra/manifests/todosvc-ingress.yaml b/_infra/manifests/todosvc-ingress.yaml deleted file mode 100644 index 2e98e8f..0000000 --- a/_infra/manifests/todosvc-ingress.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: todosvc -spec: - tls: - - hosts: - - todosvc.jobico.org - secretName: certs-secret - rules: - - host: todosvc.jobico.org - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: todosvc - port: - number: 8080 \ No newline at end of file diff --git a/_infra/manifests/todosvc-service.yaml b/_infra/manifests/todosvc-service.yaml deleted file mode 100644 index 768559f..0000000 --- a/_infra/manifests/todosvc-service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: todosvc - name: todosvc -spec: - ports: - - name: "8080" - port: 8080 - targetPort: 8080 - selector: - app: todosvc - type: LoadBalancer \ No newline at end of file diff --git a/todo-svc/Dockerfile b/todo-svc/Dockerfile index b13548c..44953ea 100644 --- a/todo-svc/Dockerfile +++ b/todo-svc/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:21-jdk-alpine as build +FROM docker.io/library/eclipse-temurin:21-jdk-alpine as build WORKDIR /workspace/app @@ -10,7 +10,7 @@ COPY src src RUN --mount=type=cache,target=/root/.m2 ./mvnw install -DskipTests RUN mkdir -p target/dependency && (cd target/dependency; jar -xf ../*.jar) -FROM eclipse-temurin:21-jdk-alpine +FROM docker.io/library/eclipse-temurin:21-jdk-alpine VOLUME /tmp ARG DEPENDENCY=/workspace/app/target/dependency COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib diff --git a/todo-svc/src/main/java/com/coeux/todo/TodoApplication.java b/todo-svc/src/main/java/com/coeux/todo/TodoApplication.java index 3cf3f4e..eee2472 100644 --- a/todo-svc/src/main/java/com/coeux/todo/TodoApplication.java +++ b/todo-svc/src/main/java/com/coeux/todo/TodoApplication.java @@ -8,6 +8,7 @@ public class TodoApplication { public static void main(String[] args) { + System.out.println("v47"); SpringApplication.run(TodoApplication.class, args); } diff --git a/todo-web/src/components/SideMenu.js b/todo-web/src/components/SideMenu.js index 7ed2ae5..7a8a4fc 100644 --- a/todo-web/src/components/SideMenu.js +++ b/todo-web/src/components/SideMenu.js @@ -6,7 +6,7 @@ export default function SideMenu({ menuShown }) { <>


-
Menu 555
+
Menu 469
diff --git a/todo-web/src/components/TopBar.js b/todo-web/src/components/TopBar.js index 3eb5745..bd32357 100644 --- a/todo-web/src/components/TopBar.js +++ b/todo-web/src/components/TopBar.js @@ -21,7 +21,7 @@ export default function TopBar({ toggleMenu, menuShown }) { href="#" className="w3-bar-item w3-button w3-right w3-tooltip" onClick={() => auth.signoutRedirect()} - title={"Bye " + auth.user?.profile.email} + title={"BBye " + auth.user?.profile.email} > {" "} diff --git a/todo-web/src/index.js b/todo-web/src/index.js index 033b7a4..a30b329 100644 --- a/todo-web/src/index.js +++ b/todo-web/src/index.js @@ -16,7 +16,7 @@ const onSigninCallback = (_user) => { const oidcConfig = { authority: "https://id.jobico.org/", - client_id: "279592422315458835@todo_for_jobico_cloud", + client_id: "281736658666193184@todo_for_jobico_cloud", redirect_uri: "https://todo.jobico.org", onSigninCallback, scope: "openid email urn:zitadel:iam:user:metadata",