From de290f97b64a4c076499f3277a1ba86276f2379b Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 7 Aug 2025 13:18:52 +0800 Subject: [PATCH] fix: update RabbitMQ password for devops service in production environment --- freeleaps/helm-pkg/devops/values.prod.yaml | 93 ++++++++----------- .../prod/ci/freeleaps-service-hub/Jenkinsfile | 21 +++++ 2 files changed, 62 insertions(+), 52 deletions(-) diff --git a/freeleaps/helm-pkg/devops/values.prod.yaml b/freeleaps/helm-pkg/devops/values.prod.yaml index d3bc6ca8..2c38aad7 100644 --- a/freeleaps/helm-pkg/devops/values.prod.yaml +++ b/freeleaps/helm-pkg/devops/values.prod.yaml @@ -2,59 +2,35 @@ global: registry: docker.io repository: freeleaps nodeSelector: {} -dashboard: - enabled: true - name: freeleaps-prod-authentication-dashboard - title: Authentication Service Dashboard (PROD) - metricsPrefix: freeleaps_authentication -authentication: +logIngest: + enabled: false +devops: replicas: 1 image: registry: docker.io repository: null - name: authentication - tag: snapshot-40e0faf + name: devops + tag: snapshot-aa89bce imagePullPolicy: IfNotPresent ports: - name: http - containerPort: 8004 + containerPort: 8014 protocol: TCP resources: requests: - cpu: 200m + cpu: '0.1' memory: 64Mi limits: - cpu: 300m + cpu: '0.2' memory: 128Mi - probes: - readiness: - type: httpGet - config: - path: /api/_/readyz - port: 8004 - initialDelaySeconds: 5 - periodSeconds: 30 - timeoutSeconds: 3 - successThreshold: 1 - failureThreshold: 3 - liveness: - type: httpGet - config: - path: /api/_/livez - port: 8004 - initialDelaySeconds: 5 - periodSeconds: 15 - timeoutSeconds: 3 - successThreshold: 1 - failureThreshold: 3 - terminationGracePeriodSeconds: 30 + probes: {} services: - - name: authentication-service + - name: devops-service type: ClusterIP - port: 8004 - targetPort: 8004 + port: 8014 + targetPort: 8014 serviceMonitor: - enabled: true + enabled: false labels: release: kube-prometheus-stack namespace: freeleaps-monitoring-system @@ -63,27 +39,40 @@ authentication: ingresses: {} configs: tz: UTC - appName: authentication - devsvcWebapiUrlBase: http://devsvc-service.freeleaps-prod.svc.freeleaps.cluster:8007/api/devsvc/ - notificationWebapiUrlBase: http://notification-service.freeleaps-prod.svc.freeleaps.cluster:8003/api/notification/ - jwtSecretKey: ea84edf152976b2fcec12b78aa8e45bc26a5cf0ef61bf16f5c317ae33b3fd8b0 + appName: devops + jwtSecretKey: '' jwtAlgorithm: HS256 - serviceApiAccessHost: 0.0.0.0 - serviceApiAccessPort: 8004 - mongodbName: freeleaps2 - mongodbPort: 27017 - mongodbUri: mongodb+srv://freeadmin:0eMV0bt8oyaknA0m@freeleaps2.zmsmpos.mongodb.net/?retryWrites=true&w=majority - metricsEnabled: 'true' + accessTokenExpireMinutes: '3600' + refreshTokenExpireDays: '1' + appMongodbName: freeleaps2 + appMongodbPort: '27017' + appMongodbUri: mongodb+srv://jetli:8IHKx6dZK8BfugGp@freeleaps2.hanbj.mongodb.net/ + metricsEnabled: 'false' probesEnabled: 'true' + baseGiteaUrl: https://alpha.gitea.freeleaps.mathmast.com + baseReconcileUrl: http://freeleaps-alpha-devops-reconciler-freeleaps-devops-reconciler.freeleaps-alpha.svc.freeleaps.cluster:5000 + baseLokiUrl: http://loki-gateway.freeleaps-logging-system + logBasePath: /app/log/devops + logRetention: 30 days + logRotation: 00:00 + logBackupFiles: '5' + logRotationBytes: '10485760' + mockMode: 'false' + mockResponseDelay: '1000' + rabbitmqHost: freeleaps-alpha-rabbitmq.freeleaps-alpha.svc.freeleaps.cluster + rabbitmqPort: 5672 + rabbitmqUsername: user + rabbitmqPassword: NjlhHFvnDuC7K0ir + rabbitmqVirtualHost: / vpa: minAllowed: - enabled: true - cpu: 50m + enabled: false + cpu: 100m memory: 64Mi maxAllowed: enabled: true - cpu: 200m + cpu: 100m memory: 128Mi controlledResources: - - cpu - - memory \ No newline at end of file + - cpu + - memory diff --git a/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile b/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile index 729aae7a..8c2d5678 100644 --- a/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile +++ b/freeleaps/prod/ci/freeleaps-service-hub/Jenkinsfile @@ -114,6 +114,27 @@ executeFreeleapsPipeline { imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', semanticReleaseEnabled: true + ], + [ + name: 'devops', + root: 'apps/devops', + language: 'python', + dependenciesManager: 'pip', + requirementsFile: 'requirements.txt', + buildCacheEnabled: true, + buildAgentImage: 'python:3.12-slim', + buildArtifacts: ['.'], + lintEnabled: false, + sastEnabled: false, + imageRegistry: 'docker.io', + imageRepository: 'freeleaps', + imageName: 'devops', + imageBuilder: 'dind', + dockerfilePath: 'Dockerfile', + imageBuildRoot: '.', + imageReleaseArchitectures: ['linux/amd64', 'linux/arm64/v8'], + registryCredentialsId: 'freeleaps-devops-docker-hub-credentials', + semanticReleaseEnabled: true ] ] } \ No newline at end of file