Merge pull request #325 from dadosfera/feat/oracle-migration-and-affinity-standardization

FEAT: migrate maestro to Oracle OKE deployment structure and standardize affinity/resources
resolve: merge conflicts with beta branch
2026-10-01 14:09:09 +00:00 · 2025-07-09 13:02:48 -03:00 · 2025-07-09 13:00:52 -03:00 · 2025-07-09 12:58:11 -03:00 · 2025-07-09 12:55:49 -03:00
13 changed files with 104 additions and 106 deletions
@@ -13,11 +13,6 @@ on:
        options:
          - stg
          - prd
-      push_to_dockerhub:
-        description: "Push image to Dockerhub?"
-        required: true
-        type: boolean
-        default: false

 jobs:
  extract_environment:
@@ -118,23 +113,6 @@ jobs:
          docker compose -f build.docker-compose.yml build
          docker compose -f build.docker-compose.yml push

-      - name: Login to Docker Hub
-        if: ${{inputs.push_to_dockerhub}}
-        uses: docker/login-action@v2
-        with:
-          username: dadosfera
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Build, Tag, and Push Image to Dockerhub
-        if: ${{inputs.push_to_dockerhub}}
-        env:
-          ENV: ${{ needs.extract_environment.outputs.environment }}
-          IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }}
-          ACCOUNT_ID: ${{ steps.aws.outputs.aws-account-id }}
-        run: |
-          docker compose -f build.docker-compose.dockerhub.yml build
-          docker compose -f build.docker-compose.dockerhub.yml push
-
      # - name: Create ZIP file to Deploy AWS Beanstalk
      #   env:
      #     ENV: ${{ needs.extract_environment.outputs.environment }}
@@ -166,7 +144,10 @@ jobs:

  helmfile-deploy:
    needs: [extract_environment, semantic_release, build_ecr_image]
-    runs-on: [self-hosted, "prd-azure"]
+    env:
+      HOME: /home/runner
+    runs-on: [self-hosted, "prd-oracle"]
+    environment: ${{ needs.extract_environment.outputs.environment }}

    steps:
      - name: Checkout code
@@ -177,13 +158,17 @@ jobs:
        with:
          version: 'v3.9.0'

-      - name: Install Azure ClI
+      - name: Install OCI CLI
        run: |
-          curl -sL https://aka.ms/InstallAzureCLIDeb | bash
+          bash -c "$(curl -L https://raw.githubusercontent.com/oracle/oci-cli/master/scripts/install/install.sh)" -- --accept-all-defaults
+          echo "$HOME/bin" >> $GITHUB_PATH

-      - uses: azure/login@v2
-        with:
-          creds: '{"clientId":"${{ secrets.ARM_CLIENT_ID }}","clientSecret":"${{ secrets.ARM_CLIENT_SECRET }}","subscriptionId":"${{ secrets.ARM_SUBSCRIPTION_ID }}","tenantId":"${{ secrets.ARM_TENANT_ID }}"}'
+      - name: Configure OCI CLI
+        run: |
+          mkdir -p ~/.oci || true
+          echo "${{ secrets.OCI_CONFIG }}" > ~/.oci/config
+          echo "${{ secrets.OCI_PRIVATE_KEY }}" > ~/.oci/oci_api_key.pem 
+          chmod 600 ~/.oci/oci_api_key.pem

      - name: Set up Python
        uses: actions/setup-python@v4
@@ -194,24 +179,31 @@ jobs:
        run: |
          wget https://github.com/helmfile/helmfile/releases/download/v0.148.0/helmfile_0.148.0_linux_amd64.tar.gz
          tar -xzf helmfile_0.148.0_linux_amd64.tar.gz
-          mv helmfile /usr/local/bin/
+          sudo mv helmfile /usr/local/bin/
          helmfile --version

      - name: Install Helm Diff Plugin
        run: helm plugin install https://github.com/databus23/helm-diff || true

-      - name: Setup kubectl
-        uses: azure/setup-kubectl@v1
-        with:
-          version: 'v1.30.1'
-
-      - name: Authenticate with cluster
+      - name: Authenticate with OKE cluster
        env:
-          CLUSTER_NAME: platform-${{ needs.extract_environment.outputs.environment }}
-        run: az aks get-credentials --resource-group dadosfera-prd --name ${CLUSTER_NAME} --overwrite-existing
+          ENV: ${{ needs.extract_environment.outputs.environment }}
+          STG_CLUSTER_ID: "ocid1.cluster.oc1.sa-saopaulo-1.aaaaaaaagh3jvln52a3ebm3dodx6emmhv5bmfs7i7sv2k4zkbcbrzcl6v37q"
+          PRD_CLUSTER_ID: "ocid1.cluster.oc1.sa-saopaulo-1.aaaaaaaanf3vptl6hc2tzd4enfd2hfpsht3wikxww5xejc3l7cwfm6l3sndq"
+        run: |
+          if [ "$ENV" = "stg" ]; then
+            CLUSTER_ID=$STG_CLUSTER_ID
+          elif [ "$ENV" = "prd" ]; then
+            CLUSTER_ID=$PRD_CLUSTER_ID
+          else
+            echo "Unknown environment: $ENV"
+            exit 1
+          fi
+          
+          oci ce cluster create-kubeconfig --cluster-id ${CLUSTER_ID} --file $HOME/.kube/config --region sa-saopaulo-1 --token-version 2.0.0 --kube-endpoint PRIVATE_ENDPOINT

      - name: Run Helmfile Apply
        env:
          ENV: ${{ needs.extract_environment.outputs.environment }}
          IMAGE_TAG: ${{ needs.semantic_release.outputs.new_release_version }}
-        run: helmfile -f helmfiles/${ENV}.yaml sync --set image.tag=$IMAGE_TAG
+        run: helmfile -f deploy/helmfiles/${ENV}.yaml sync --set image.tag=$IMAGE_TAG
@@ -4,7 +4,7 @@ on:
  pull_request:
    branches:
      - main
-      - stg
+      - beta

 jobs:
  extract_environment:
@@ -21,17 +21,13 @@ jobs:
          fi
        id: extract_environment

-  helmfile-deploy:
+  helmfile-check:
+    env:
+      HOME: /home/runner
    needs: [extract_environment]
-    runs-on: [self-hosted, "prd-azure"]
-
+    environment: ${{ needs.extract_environment.outputs.environment }}
+    runs-on: [self-hosted, "prd-oracle"]
    steps:
-      - name: Summary
-        env:
-          ENV: ${{ needs.extract_environment.outputs.environment }}
-        run: |
-          echo "### :rocket: Deploy da branch \`$GITHUB_REF_NAME\`  para o environment ($ENV)" >> $GITHUB_STEP_SUMMARY
-
      - name: Checkout code
        uses: actions/checkout@v3

@@ -40,13 +36,28 @@ jobs:
        with:
          version: 'v3.9.0'

-      - name: Install Azure ClI
+      - name: Determine DNS_HOST based on environment
+        id: set_dns
+        env:
+          ENV: ${{ needs.extract_environment.outputs.environment }}
        run: |
-          curl -sL https://aka.ms/InstallAzureCLIDeb | bash
+          if [ "$ENV" = "prd" ]; then
+            echo "dns_host=dadosfera.ai" >> $GITHUB_OUTPUT
+          elif [ "$ENV" = "stg" ]; then
+            echo "dns_host=stg.dadosfera.ai" >> $GITHUB_OUTPUT
+          fi
+  
+      - name: Install OCI CLI
+        run: |
+          bash -c "$(curl -L https://raw.githubusercontent.com/oracle/oci-cli/master/scripts/install/install.sh)" -- --accept-all-defaults
+          echo "$HOME/bin" >> $GITHUB_PATH

-      - uses: azure/login@v2
-        with:
-          creds: '{"clientId":"${{ secrets.ARM_CLIENT_ID }}","clientSecret":"${{ secrets.ARM_CLIENT_SECRET }}","subscriptionId":"${{ secrets.ARM_SUBSCRIPTION_ID }}","tenantId":"${{ secrets.ARM_TENANT_ID }}"}'
+      - name: Configure OCI CLI
+        run: |
+          mkdir -p ~/.oci || true
+          echo "${{ secrets.OCI_CONFIG }}" > ~/.oci/config
+          echo "${{ secrets.OCI_PRIVATE_KEY }}" > ~/.oci/oci_api_key.pem
+          chmod 600 ~/.oci/oci_api_key.pem

      - name: Set up Python
        uses: actions/setup-python@v4
@@ -57,23 +68,35 @@ jobs:
        run: |
          wget https://github.com/helmfile/helmfile/releases/download/v0.148.0/helmfile_0.148.0_linux_amd64.tar.gz
          tar -xzf helmfile_0.148.0_linux_amd64.tar.gz
-          mv helmfile /usr/local/bin/
+          sudo mv helmfile /usr/local/bin/
          helmfile --version

      - name: Install Helm Diff Plugin
        run: helm plugin install https://github.com/databus23/helm-diff || true

+      - name: Authenticate with OKE cluster
+        env:
+          ENV: ${{ needs.extract_environment.outputs.environment }}
+          STG_CLUSTER_ID: "ocid1.cluster.oc1.sa-saopaulo-1.aaaaaaaagh3jvln52a3ebm3dodx6emmhv5bmfs7i7sv2k4zkbcbrzcl6v37q"
+          PRD_CLUSTER_ID: "ocid1.cluster.oc1.sa-saopaulo-1.aaaaaaaanf3vptl6hc2tzd4enfd2hfpsht3wikxww5xejc3l7cwfm6l3sndq"
+        run: |
+          if [ "$ENV" = "stg" ]; then
+            CLUSTER_ID=$STG_CLUSTER_ID
+          elif [ "$ENV" = "prd" ]; then
+            CLUSTER_ID=$PRD_CLUSTER_ID
+          else
+            echo "Unknown environment: $ENV"
+            exit 1
+          fi
+          
+          oci ce cluster create-kubeconfig --cluster-id ${CLUSTER_ID} --file $HOME/.kube/config --region sa-saopaulo-1 --token-version 2.0.0 --kube-endpoint PRIVATE_ENDPOINT 
+
      - name: Setup kubectl
        uses: azure/setup-kubectl@v1
        with:
          version: 'v1.30.1'

-      - name: Authenticate with cluster
-        env:
-          CLUSTER_NAME: platform-${{ needs.extract_environment.outputs.environment }}
-        run: az aks get-credentials --resource-group dadosfera-prd --name ${CLUSTER_NAME} --overwrite-existing
-
      - name: Run Helmfile Diff
        env:
          ENV: ${{ needs.extract_environment.outputs.environment }}
-        run: helmfile -f helmfiles/${ENV}.yaml diff
+        run: helmfile -f deploy/helmfiles/${ENV}.yaml diff
@@ -27,15 +27,10 @@ spec:
        - name: {{ .Values.imagePullSecrets }}
      nodeSelector:
        "beta.kubernetes.io/os": linux
+      {{- if .Values.affinity }}
      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: application
-                    operator: In
-                    values:
-                      - general
+        {{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}

      tolerations:
      - key: "kubernetes.azure.com/scalesetpriority"
@@ -48,13 +43,10 @@ spec:
          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
          ports:
            - containerPort: {{ .Values.containerPort }}
+          {{- if .Values.resources }}
          resources:
-            requests:
-              cpu: {{ .Values.resources.requests.cpu }}
-              memory: {{ .Values.resources.requests.memory }}
-            limits:
-              cpu: {{ .Values.resources.limits.cpu }}
-              memory: {{ .Values.resources.limits.memory }}
+            {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
          env:
            - name: AWS_IDENTITY_POOL_ID
              value: {{ .Values.maestro.aws_identity_pool_id }}
@@ -51,3 +51,13 @@ autoscaling:
  maxReplicas: 100
  targetCPUUtilizationPercentage: 80
  targetMemoryUtilizationPercentage: 80
+
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+        - matchExpressions:
+            - key: name
+              operator: In
+              values:
+                - general
@@ -1,8 +1,8 @@
 charts:
  - name: maestro
-    chart: ../maestro
+    chart: ../helm-chart
    values:
-    - ../maestro/values.yaml
+    - ../helm-chart/values.yaml
    set:
      - name: app_name
        value: maestro
@@ -24,9 +24,9 @@ charts:
        value: 2
  
  - name: unimed-maestro
-    chart: ../maestro
+    chart: ../helm-chart
    values:
-    - ../maestro/values.yaml
+    - ../helm-chart/values.yaml
    set:
      - name: app_name
        value: maestro-unimed
@@ -1,8 +1,8 @@
 charts:
  - name: maestro
-    chart: ../maestro
+    chart: ../helm-chart
    values:
-    - ../maestro/values.yaml
+    - ../helm-chart/values.yaml
    set:
      - name: maestro.duc_url
        value: duc.stg.dadosfera.ai
@@ -23,9 +23,9 @@ charts:
  
    # Environment to test Network Policies
  - name: private-maestro
-    chart: ../maestro
+    chart: ../helm-chart
    values:
-    - ../maestro/values.yaml
+    - ../helm-chart/values.yaml
    set:
      - name: app_name
        value: maestro-private
@@ -48,5 +48,9 @@ charts:
        value: 14d52fd4-d83d-4cdd-be34-bf11cc28b3bd
      - name: replicaCount
        value: 1
+      - name: affinity
+        value: null
+      - name: resources
+        value: null
      - name: maestro.restricted_ip
-        value: "57.151.113.140/30"
+        value: "57.151.113.140/30"
@@ -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/
Author	SHA1	Message	Date
Rafael Santana	da39a07f25	Merge pull request #325 from dadosfera/feat/oracle-migration-and-affinity-standardization FEAT: migrate maestro to Oracle OKE deployment structure and standardize affinity/resources	2025-07-09 13:02:48 -03:00
Rafael	f2f65285de	resolve: merge conflicts with beta branch - Resolve ingress.yaml timeout annotation conflicts by keeping both configurations - Resolve stg.yaml conflicts by merging affinity/resources config with restricted_ip - Fix chart references in unimed-maestro and private-maestro sections - Update all chart paths from ../maestro to ../helm-chart for consistency This merge brings in the latest beta changes while preserving our Oracle migration and affinity standardization configuration.	2025-07-09 13:00:52 -03:00
Rafael	cac8f93330	CI: update validate-k8s.yml to use beta branch for staging - Change trigger branches from main/stg to main/beta - Update environment extraction to map beta → stg environment - Align with standard branch naming convention (beta for staging) - Consistent with deploy-manually.yml workflow configuration	2025-07-09 12:58:11 -03:00
Rafael	bb03b18f4a	FEAT: migrate maestro to Oracle OKE deployment structure and standardize affinity/resources Oracle Migration Changes: - Create deploy/helm-chart/ directory structure (moved from maestro/) - Create deploy/helmfiles/ directory structure (moved from helmfiles/) - Update chart references in helmfiles from ../maestro to ../helm-chart - Update deploy-manually.yml from Azure AKS to Oracle OKE - Update validate-k8s.yml from Azure AKS to Oracle OKE - Replace Azure CLI with OCI CLI installation and configuration - Replace Azure authentication with OCI authentication using secrets - Replace az aks get-credentials with oci ce cluster create-kubeconfig - Update helmfile paths from helmfiles/ to deploy/helmfiles/ - Remove DockerHub integration (push_to_dockerhub input and related steps) - Change runner from [self-hosted, prd-azure] to [self-hosted, prd-oracle] - Add environment field for proper Oracle deployment environment handling - Add HOME environment variable for OCI CLI Affinity/Resources Standardization: - Add affinity configuration with name=general node selector in values.yaml - Update deployment template to use conditional affinity and resources blocks - Configure staging to disable both affinity and resources (null values) - Enable production to use affinity targeting name=general nodes - Enable production to use standard resource limits (100m-2000m CPU, 1500Mi-2Gi memory) This brings maestro into full compliance with Oracle migration requirements and implements the standardized affinity/resources pattern consistent with in-factory and duc.	2025-07-09 12:55:49 -03:00