From db3d13cfd81c9bd8cc3b41416997cc3d28db4acd Mon Sep 17 00:00:00 2001 From: Benedetta-fabbri Date: Fri, 31 Jan 2025 10:19:34 +0100 Subject: [PATCH 1/2] [P4ADEV-1889] migration to ArgoCD --- .devops/deploy-pipelines.yml | 182 --------------------- .github/workflows/flow-docker-snapshot.yml | 92 +++++++++++ .github/workflows/flow-release.yml | 58 +++++++ .github/workflows/release.yml | 24 --- .github/workflows/snapshot-docker.yml | 23 --- helm/.helmignore | 23 --- helm/Chart.yaml | 10 -- helm/values-dev.yaml | 36 ---- helm/values-prod.yaml | 36 ---- helm/values-uat.yaml | 36 ---- helm/values.yaml | 94 ----------- 11 files changed, 150 insertions(+), 464 deletions(-) delete mode 100644 .devops/deploy-pipelines.yml create mode 100644 .github/workflows/flow-docker-snapshot.yml create mode 100644 .github/workflows/flow-release.yml delete mode 100644 .github/workflows/release.yml delete mode 100644 .github/workflows/snapshot-docker.yml delete mode 100644 helm/.helmignore delete mode 100644 helm/Chart.yaml delete mode 100644 helm/values-dev.yaml delete mode 100644 helm/values-prod.yaml delete mode 100644 helm/values-uat.yaml delete mode 100644 helm/values.yaml diff --git a/.devops/deploy-pipelines.yml b/.devops/deploy-pipelines.yml deleted file mode 100644 index 58ed9161..00000000 --- a/.devops/deploy-pipelines.yml +++ /dev/null @@ -1,182 +0,0 @@ -# Build and push image to Azure Container Registry; Deploy to Azure Kubernetes Service -# https://docs.microsoft.com/azure/devops/pipelines/languages/docker - -parameters: - - name: 'executeBuild' - displayName: 'Launch docker build' - type: boolean - default: true - -trigger: - branches: - include: - - develop - - uat - - main - paths: - include: - - src/* - - build.gradle.kts - - helm/* - - Dockerfile - - settings.gradle.kts - -pr: none - -resources: - - repo: self - -variables: - - # vmImageNameDefault: 'ubuntu-latest' - vmImageNameDefault: ubuntu-22.04 - - imageRepository: '$(K8S_IMAGE_REPOSITORY_NAME)' - deployNamespace: '$(DEPLOY_NAMESPACE)' - helmReleaseName : '$(HELM_RELEASE_NAME)' - canDeploy: true - - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/uat') }}: - environment: 'UAT' - dockerRegistryName: '$(UAT_CONTAINER_REGISTRY_NAME)' - dockerRegistryServiceConnection: '$(UAT_CONTAINER_REGISTRY_SERVICE_CONN)' - kubernetesServiceConnection: '$(UAT_KUBERNETES_SERVICE_CONN)' - containerRegistry: '$(UAT_CONTAINER_REGISTRY_NAME)' - selfHostedAgentPool: $(UAT_AGENT_POOL) - postmanEnvFile: p4pa_UAT.postman_environment.json - - ${{ elseif eq(variables['Build.SourceBranch'], 'refs/heads/main') }}: - environment: 'PROD' - dockerRegistryName: '$(PROD_CONTAINER_REGISTRY_NAME)' - dockerRegistryServiceConnection: '$(PROD_CONTAINER_REGISTRY_SERVICE_CONN)' - kubernetesServiceConnection: '$(PROD_KUBERNETES_SERVICE_CONN)' - containerRegistry: '$(PROD_CONTAINER_REGISTRY_NAME)' - selfHostedAgentPool: $(PROD_AGENT_POOL) - postmanEnvFile: p4pa_PROD.postman_environment.json #Not used - - ${{ else }}: - environment: 'DEV' - dockerRegistryName: '$(DEV_CONTAINER_REGISTRY_NAME)' - dockerRegistryServiceConnection: '$(DEV_CONTAINER_REGISTRY_SERVICE_CONN)' - kubernetesServiceConnection: '$(DEV_KUBERNETES_SERVICE_CONN)' - containerRegistry: '$(DEV_CONTAINER_REGISTRY_NAME)' - selfHostedAgentPool: $(DEV_AGENT_POOL) - postmanEnvFile: p4pa_DEV.postman_environment.json - -stages: - - stage: stage_build - condition: eq(variables.canDeploy, true) - displayName: 'Build and publish image to ${{ variables.environment }} registry' - jobs: - - job: job_build - displayName: Build - pool: - vmImage: $(vmImageNameDefault) - steps: - - task: Bash@3 - displayName: Get app version - name: getAppVersion - condition: and(succeeded(), eq(variables.canDeploy, true)) - inputs: - targetType: 'inline' - script: | - version=$(cat build.gradle.kts | grep "version = '.*'" | cut -d"'" -f2) - echo "Building $version version" - echo "##vso[task.setvariable variable=appVersion;isOutput=true]$version" - failOnStderr: true - - - task: Docker@2 - condition: and(succeeded(), ${{ parameters.executeBuild }}) - displayName: 'Build and publish $(imageRepository) image' - inputs: - containerRegistry: '$(dockerRegistryServiceConnection)' - repository: '$(imageRepository)' - command: 'buildAndPush' - tags: | - latest - $(Build.SourceVersion) - $(getAppVersion.appVersion) - - - task: PublishPipelineArtifact@1 - displayName: 'Publish manifests into pipeline artifacts' - condition: succeeded() - inputs: - targetPath: '$(Build.Repository.LocalPath)/helm' - artifact: 'helm' - publishLocation: 'pipeline' - - task: 'Bash@3' - displayName: 'Send message on Slack' - condition: in(variables['Agent.JobStatus'], 'SucceededWithIssues', 'Failed') - inputs: - targetType: 'inline' - script: > - curl -X POST \ - -H "Content-type: application/json" \ - --data '{"text": "*Attention: There is an error in pipeline $(System.DefinitionName) in step _build_!*\nCheck the logs for more details $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId) to view the build results."}' \ - $(SLACK_WEBHOOK_URL) - - stage: stage_deploy - displayName: 'Deploy to ${{ variables.environment }} K8S' - dependsOn: [ stage_build ] - variables: - appVersion: $[ stageDependencies.stage_build.job_build.outputs['getAppVersion.appVersion'] ] - condition: and(succeeded(), eq(variables.canDeploy, true)) - jobs: - - deployment: job_deploy - displayName: 'Deploy' - pool: - name: $(selfHostedAgentPool) - environment: '$(environment)' - strategy: - runOnce: - deploy: - steps: - - download: none - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - artifactName: 'helm' - targetPath: '$(Pipeline.Workspace)/helm' - - task: KubectlInstaller@0 - - task: Bash@3 - name: helm_dependency_build - displayName: Helm dependency build - inputs: - workingDirectory: '$(Pipeline.Workspace)/helm' - targetType: 'inline' - script: | - helm repo add pagopa-microservice https://pagopa.github.io/aks-microservice-chart-blueprint - helm dep build - failOnStderr: true - - bash: | - echo 'microservice-chart: - podAnnotations: - "build/buildNumber": "$(Build.BuildNumber)" - "build/appVersion": "$(appVersion)" - "build/sourceVersion": "$(Build.SourceVersion)"' > buildMetadata.yaml - displayName: Writing build metadata - - - task: HelmDeploy@0 - displayName: Helm upgrade - inputs: - kubernetesServiceEndpoint: ${{ variables.kubernetesServiceConnection }} - namespace: '$(deployNamespace)' - command: upgrade - chartType: filepath - chartPath: $(Pipeline.Workspace)/helm - chartName: ${{ variables.helmReleaseName }} - releaseName: ${{ variables.helmReleaseName }} - valueFile: "$(Pipeline.Workspace)/helm/values-${{ lower(variables.environment) }}.yaml" - install: true - waitForExecution: true - arguments: --timeout 5m0s - --values buildMetadata.yaml - - task: 'Bash@3' - displayName: 'Send message on Slack' - condition: in(variables['Agent.JobStatus'], 'SucceededWithIssues', 'Failed') - inputs: - targetType: 'inline' - script: > - curl -X POST \ - -H "Content-type: application/json" \ - --data '{"text": "*Attention: There is an error in pipeline $(System.DefinitionName) in step _deploy_!*\nCheck the logs for more details $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId) to view the build results."}' \ - $(SLACK_WEBHOOK_URL) diff --git a/.github/workflows/flow-docker-snapshot.yml b/.github/workflows/flow-docker-snapshot.yml new file mode 100644 index 00000000..d4b55fac --- /dev/null +++ b/.github/workflows/flow-docker-snapshot.yml @@ -0,0 +1,92 @@ +name: 📦 Flow Snapshot Docker + +on: + push: + branches-ignore: + - 'develop' + - 'uat' + - 'main' + paths-ignore: + - 'CODEOWNERS' + - '**.md' + - '.**' + workflow_dispatch: + inputs: + docker_build_enabled: + description: 'Enable Docker build' + required: false + default: 'true' + azdo_trigger_enabled: + description: 'Enable Azure DevOps trigger' + required: false + default: 'true' + argocd_target_branch: + description: 'argocd target branch name' + required: false + default: 'main' + postman_branch: + description: postman branch name' + required: false + default: 'develop' + +env: + # branch choosed by workflow_dispatch or by push event + CURRENT_BRANCH: ${{ github.event.inputs.branch || github.ref_name }} + +permissions: + packages: write + contents: read + +jobs: + checkout: + name: 🔖 Checkout Repository + runs-on: ubuntu-22.04 + steps: + - name: Checkout code + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + with: + ref: ${{ env.CURRENT_BRANCH }} + + docker-build: + name: 📦 Docker Build and Push + needs: checkout + runs-on: ubuntu-22.04 + if: ${{ github.event_name == 'push' || github.event.inputs.docker_build_enabled == 'true' }} + steps: + - name: Checkout code + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + with: + ref: ${{ env.CURRENT_BRANCH }} + + - name: Run Snapshot Docker Build/Push + # https://github.com/pagopa/github-actions-template/releases/tag/v2.1.1 + uses: pagopa/github-actions-template/payments-flow-docker-snapshot@e67e0ec4bb01d6cb5065e311ba0e1c92c49966a7 + with: + current_branch: ${{ github.ref_name }} + + azure-devops-trigger: + name: 🅰️ Azure DevOps Pipeline Trigger + needs: docker-build + runs-on: ubuntu-22.04 + if: | + always() && + needs.docker-build.result != 'failure' && + github.event.inputs.azdo_trigger_enabled == 'true' + steps: + - name: Trigger Azure DevOps Pipeline + # https://github.com/pagopa/github-actions-template/releases/tag/v2.1.0 + uses: pagopa/github-actions-template/azure-devops-trigger-pipeline@cad30356d9046af6e7b0cee43db4cf919cc408f9 + with: + enable_azure_devops_step: 'true' + azure_devops_project_url: 'https://dev.azure.com/pagopaspa/p4pa-projects' + azure_devops_pipeline_name: 'p4pa-payhub-deploy-aks.deploy' + azure_devops_pat: ${{ secrets.AZURE_DEVOPS_TOKEN }} + azure_template_parameters: | + { + "APPS_TOP": "[p4pa-workflow-hub]", + "ARGOCD_TARGET_BRANCH": "${{ github.event.inputs.argocd_target_branch }}", + "POSTMAN_BRANCH": "${{ github.event.inputs.postman_branch }}", + "TRIGGER_MESSAGE": "p4pa-workflow-hub" + } + + diff --git a/.github/workflows/flow-release.yml b/.github/workflows/flow-release.yml new file mode 100644 index 00000000..18033a58 --- /dev/null +++ b/.github/workflows/flow-release.yml @@ -0,0 +1,58 @@ +name: 🚀 Flow Release + +on: + push: + branches: + - develop + - uat + - main + paths-ignore: + - 'CODEOWNERS' + - '**.md' + - '.**' + workflow_dispatch: + +permissions: + packages: write + contents: write + +jobs: + checkout: + name: 🔖 Checkout Repository + runs-on: ubuntu-22.04 + steps: + - name: Checkout code + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 + with: + ref: ${{ github.ref_name }} + + payments-flow-release: + name: 🚀 Release + runs-on: ubuntu-22.04 + needs: checkout + steps: + - name: 🚀 release + docker + # https://github.com/pagopa/github-actions-template/releases/tag/v2.1.1 + uses: pagopa/github-actions-template/payments-flow-release@e67e0ec4bb01d6cb5065e311ba0e1c92c49966a7 + with: + current_branch: ${{ github.ref_name }} + + azure-devops-trigger: + name: 🅰️ Azure DevOps Pipeline Trigger + needs: payments-flow-release + runs-on: ubuntu-22.04 + steps: + - name: Trigger Azure DevOps Pipeline + # https://github.com/pagopa/github-actions-template/releases/tag/v2.1.0 + uses: pagopa/github-actions-template/azure-devops-trigger-pipeline@cad30356d9046af6e7b0cee43db4cf919cc408f9 + with: + enable_azure_devops_step: 'true' + azure_devops_project_url: 'https://dev.azure.com/pagopaspa/p4pa-projects' + azure_devops_pipeline_name: 'p4pa-payhub-deploy-aks.deploy' + azure_devops_pat: ${{ secrets.AZURE_DEVOPS_TOKEN }} + azure_template_parameters: | + { + "APPS_TOP": "[p4pa-workflow-hub]", + "POSTMAN_BRANCH": "${{ github.ref_name }}", + "TRIGGER_MESSAGE": "p4pa-workflow-hub" + } diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 07ae6f51..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Release - -on: - # Trigger the workflow on push on the main branch - push: - branches: - - main - paths-ignore: - - 'CODEOWNERS' - - '**.md' - - '.**' - -jobs: - release: - name: Release - runs-on: ubuntu-22.04 - - steps: - - - name: 🚀 Release with docker action - id: release - uses: pagopa/eng-github-actions-iac-template/global/release-with-docker@main # - with: - github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/snapshot-docker.yml b/.github/workflows/snapshot-docker.yml deleted file mode 100644 index 3496adf1..00000000 --- a/.github/workflows/snapshot-docker.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Snapshot docker build and push - -on: - push: - # Sequence of patterns matched against refs/heads - branches-ignore: - - 'main' - paths-ignore: - - 'CODEOWNERS' - - '**.md' - - '.**' - -jobs: - release: - name: Snapshot Docker - runs-on: ubuntu-22.04 - - steps: - - name: 📦 Docker build and push - id: release - uses: pagopa/eng-github-actions-iac-template/global/docker-build-push@main # - with: - github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/helm/.helmignore b/helm/.helmignore deleted file mode 100644 index 0e8a0eb3..00000000 --- a/helm/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/helm/Chart.yaml b/helm/Chart.yaml deleted file mode 100644 index bdec32b7..00000000 --- a/helm/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -name: template-payments-java-repository -description: TEMPLATE PAYMENTS JAVA REPOSITORY -type: application -version: 1.0.0 -appVersion: 1.0.0 -dependencies: - - name: microservice-chart - version: 5.9.0 - repository: "https://pagopa.github.io/aks-microservice-chart-blueprint" diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml deleted file mode 100644 index 7bf72373..00000000 --- a/helm/values-dev.yaml +++ /dev/null @@ -1,36 +0,0 @@ -microservice-chart: - image: - repository: p4paditncorecommonacr.azurecr.io/p4padebtpositions - tag: latest - pullPolicy: Always - - ingress: - host: "hub.internal.dev.p4pa.pagopa.it" - - resources: - requests: - memory: "256Mi" - cpu: "100m" - limits: - memory: "4Gi" - cpu: "500m" - - autoscaling: - enable: false - # minReplica: 1 - # maxReplica: 1 - # pollingInterval: 30 # seconds - # cooldownPeriod: 300 # seconds - # triggers: - # - type: cpu - # metadata: - # type: Utilization # Allowed types are 'Utilization' or 'AverageValue' - # value: "70" - - envConfig: - ENV: "DEV" - JAVA_TOOL_OPTIONS: "-Xms128m -Xmx4g -Djava.util.concurrent.ForkJoinPool.common.parallelism=7 -javaagent:/app/applicationinsights-agent.jar -Dapplicationinsights.configuration.file=/mnt/file-config-external/appinsights-config/applicationinsights.json -agentlib:jdwp=transport=dt_socket,server=y,address=8001,suspend=n -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=3002 -Dcom.sun.management.jmxremote.rmi.port=3003 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" - - keyvault: - name: "p4pa-d-payhub-kv" - tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d" diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml deleted file mode 100644 index 90fd1415..00000000 --- a/helm/values-prod.yaml +++ /dev/null @@ -1,36 +0,0 @@ -microservice-chart: - image: - repository: p4papitncorecommonacr.azurecr.io/p4padebtpositions - tag: latest - pullPolicy: Always - - ingress: - host: "hub.internal.p4pa.pagopa.it" - - resources: - requests: - memory: "256Mi" - cpu: "100m" - limits: - memory: "4Gi" - cpu: "500m" - - autoscaling: - enable: false - # minReplica: 1 - # maxReplica: 1 - # pollingInterval: 30 # seconds - # cooldownPeriod: 300 # seconds - # triggers: - # - type: cpu - # metadata: - # type: Utilization # Allowed types are 'Utilization' or 'AverageValue' - # value: "70" - - envConfig: - ENV: "PROD" - JAVA_TOOL_OPTIONS: "-Xms128m -Xmx4g -Djava.util.concurrent.ForkJoinPool.common.parallelism=7 -javaagent:/app/applicationinsights-agent.jar -Dapplicationinsights.configuration.file=/mnt/file-config-external/appinsights-config/applicationinsights.json -agentlib:jdwp=transport=dt_socket,server=y,address=8001,suspend=n -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=3002 -Dcom.sun.management.jmxremote.rmi.port=3003 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" - - keyvault: - name: "p4pa-p-payhub-kv" - tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d" diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml deleted file mode 100644 index 278a4e39..00000000 --- a/helm/values-uat.yaml +++ /dev/null @@ -1,36 +0,0 @@ -microservice-chart: - image: - repository: p4pauitncorecommonacr.azurecr.io/p4padebtpositions - tag: latest - pullPolicy: Always - - ingress: - host: "hub.internal.uat.p4pa.pagopa.it" - - resources: - requests: - memory: "256Mi" - cpu: "100m" - limits: - memory: "4Gi" - cpu: "500m" - - autoscaling: - enable: false - # minReplica: 1 - # maxReplica: 1 - # pollingInterval: 30 # seconds - # cooldownPeriod: 300 # seconds - # triggers: - # - type: cpu - # metadata: - # type: Utilization # Allowed types are 'Utilization' or 'AverageValue' - # value: "70" - - envConfig: - ENV: "UAT" - JAVA_TOOL_OPTIONS: "-Xms128m -Xmx4g -Djava.util.concurrent.ForkJoinPool.common.parallelism=7 -javaagent:/app/applicationinsights-agent.jar -Dapplicationinsights.configuration.file=/mnt/file-config-external/appinsights-config/applicationinsights.json -agentlib:jdwp=transport=dt_socket,server=y,address=8001,suspend=n -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=3002 -Dcom.sun.management.jmxremote.rmi.port=3003 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" - - keyvault: - name: "p4pa-u-payhub-kv" - tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d" diff --git a/helm/values.yaml b/helm/values.yaml deleted file mode 100644 index 7a8c4619..00000000 --- a/helm/values.yaml +++ /dev/null @@ -1,94 +0,0 @@ -microservice-chart: - namespace: "payhub" - nameOverride: "" - fullnameOverride: "" - - livenessProbe: - httpGet: - path: /actuator/health/liveness - port: 8080 - initialDelaySeconds: 120 - failureThreshold: 15 - periodSeconds: 10 - - readinessProbe: - httpGet: - path: /actuator/health/readiness - port: 8080 - initialDelaySeconds: 120 - failureThreshold: 15 - periodSeconds: 10 - - deployment: - create: true - - service: - create: true - type: ClusterIP - port: 8080 - - ingress: - create: true - path: /p4padebtpositions/(.*) - - serviceAccount: - create: false - annotations: {} - name: "" - - podAnnotations: {} - - podSecurityContext: - seccompProfile: - type: RuntimeDefault - - securityContext: - allowPrivilegeEscalation: false - runAsNonRoot: true - runAsUser: 65534 - runAsGroup: 65534 - - externalConfigMapFiles: - create: true - configMaps: - - name: appinsights-config - key: applicationinsights.json - - externalConfigMapValues: - eventhub-config: - KAFKA_CONFIG_SECURITY_PROTOCOL: p4pa-payhub-security-protocol - KAFKA_CONFIG_SASL_MECHANISM: p4pa-payhub-sasl-mechanism - KAFKA_TOPIC_PAYMENTS: p4pa-payhub-payments-topic - - envConfig: - APPLICATIONINSIGHTS_ROLE_NAME: "p4pa-debt-positions" - APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" - APPLICATIONINSIGHTS_INSTRUMENTATION_MICROMETER_ENABLED: "false" - APPLICATIONINSIGHTS_PREVIEW_PROFILER_ENABLED: "false" - ENABLE_AUDIT_APPENDER: "TRUE" - - ORGANIZATION_BASE_URL: "http://p4pa-organization-microservice-chart:8080" - - - envSecret: - APPLICATIONINSIGHTS_CONNECTION_STRING: appinsights-connection-string - JWT_TOKEN_PUBLIC_KEY: jwt-public-key - DEBT_POSITIONS_DB_HOST: db-host - DEBT_POSITIONS_DB_USER: db-piattaforma-unitaria-login-username - DEBT_POSITIONS_DB_PASSWORD: db-piattaforma-unitaria-login-password - - CITIZENDB_HOST: db-host - CITIZENDB_USER: db-mypay-login-username - CITIZENDB_PASSWORD: db-mypay-login-password - - DATA_CIPHER_ENCRYPT_PASSWORD: data-cipher-encrypt-password - DATA_CIPHER_HASH_PEPPER: data-cipher-hash-pepper - - KAFKA_BINDER_BROKER: p4pa-payhub-kafka-broker - KAFKA_PAYMENTS_PRODUCER_SASL_JAAS_CONFIG: p4pa-payhub-payments-evh-producer-jaas-config - - # nodeSelector: {} - - # tolerations: [] - - # affinity: {} From a9bd347c26740ea2924f9fb011bb8ff855d9a712 Mon Sep 17 00:00:00 2001 From: Benedetta-fabbri Date: Fri, 31 Jan 2025 10:47:37 +0100 Subject: [PATCH 2/2] [P4ADEV-1889] migration to ArgoCD --- .github/workflows/flow-docker-snapshot.yml | 14 +++++--------- .github/workflows/flow-release.yml | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/flow-docker-snapshot.yml b/.github/workflows/flow-docker-snapshot.yml index d4b55fac..62f40495 100644 --- a/.github/workflows/flow-docker-snapshot.yml +++ b/.github/workflows/flow-docker-snapshot.yml @@ -21,9 +21,9 @@ on: required: false default: 'true' argocd_target_branch: - description: 'argocd target branch name' - required: false - default: 'main' + description: 'argocd target branch name' + required: false + default: 'main' postman_branch: description: postman branch name' required: false @@ -33,10 +33,6 @@ env: # branch choosed by workflow_dispatch or by push event CURRENT_BRANCH: ${{ github.event.inputs.branch || github.ref_name }} -permissions: - packages: write - contents: read - jobs: checkout: name: 🔖 Checkout Repository @@ -83,10 +79,10 @@ jobs: azure_devops_pat: ${{ secrets.AZURE_DEVOPS_TOKEN }} azure_template_parameters: | { - "APPS_TOP": "[p4pa-workflow-hub]", + "APPS_TOP": "[p4pa-debt-positions]", "ARGOCD_TARGET_BRANCH": "${{ github.event.inputs.argocd_target_branch }}", "POSTMAN_BRANCH": "${{ github.event.inputs.postman_branch }}", - "TRIGGER_MESSAGE": "p4pa-workflow-hub" + "TRIGGER_MESSAGE": "p4pa-debt-positions" } diff --git a/.github/workflows/flow-release.yml b/.github/workflows/flow-release.yml index 18033a58..9e794cd3 100644 --- a/.github/workflows/flow-release.yml +++ b/.github/workflows/flow-release.yml @@ -52,7 +52,7 @@ jobs: azure_devops_pat: ${{ secrets.AZURE_DEVOPS_TOKEN }} azure_template_parameters: | { - "APPS_TOP": "[p4pa-workflow-hub]", + "APPS_TOP": "[p4pa-debt-positions]", "POSTMAN_BRANCH": "${{ github.ref_name }}", - "TRIGGER_MESSAGE": "p4pa-workflow-hub" + "TRIGGER_MESSAGE": "p4pa-debt-positions" }