diff --git a/.github/workflows/helm-chart.yml b/.github/workflows/crib-helm-chart-pr.yml similarity index 66% rename from .github/workflows/helm-chart.yml rename to .github/workflows/crib-helm-chart-pr.yml index f0dd25c5dbb..ae13f277a02 100644 --- a/.github/workflows/helm-chart.yml +++ b/.github/workflows/crib-helm-chart-pr.yml @@ -4,7 +4,7 @@ on: pull_request: paths: - "charts/**" - - ".github/workflows/helm-chart.yml" + - ".github/workflows/crib-helm-chart.yml" jobs: ci-lint-helm-charts: @@ -15,13 +15,12 @@ jobs: with: # chart testing inputs chart-testing-extra-args: "--lint-conf=lintconf.yaml" - charts-dir: charts/chainlink-cluster + charts-dir: charts/crib-chainlink-cluster # grafana inputs metrics-job-name: ci-lint-helm-charts gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} - ci-kubeconform: runs-on: ubuntu-latest steps: @@ -29,9 +28,19 @@ jobs: uses: smartcontractkit/.github/actions/ci-kubeconform@1ae8a9a984814c4daf50aa96f03be2cba0ef3fec # ci-kubeconform@0.2.0 with: # kubeform inputs - charts-dir: charts/chainlink-cluster + charts-dir: charts/crib-chainlink-cluster # grafana inputs metrics-job-name: ci-kubeconform gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} + ci-build-charts: + runs-on: ubuntu-latest + steps: + - name: ci-build-charts + uses: smartcontractkit/.github/actions/cicd-build-publish-charts@7ac9af09dda8c553593d2153a975b43b6958fa9f # cicd-build-publish-charts@0.1.3 + with: + # grafana inputs + metrics-job-name: ci-build-charts + gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }} \ No newline at end of file diff --git a/.github/workflows/crib-helm-chart-push-develop.yml b/.github/workflows/crib-helm-chart-push-develop.yml new file mode 100644 index 00000000000..a03e3e3823e --- /dev/null +++ b/.github/workflows/crib-helm-chart-push-develop.yml @@ -0,0 +1,69 @@ +name: Helm Publish + +on: + push: + branches: + - develop + paths: + - "charts/**" + - ".github/workflows/crib-helm-chart.yml" + - ".github/workflows/crib-helm-chart-push-develop.yml" +jobs: + helm_release: + runs-on: ubuntu-latest + environment: build-develop + permissions: + id-token: write + contents: read + steps: + - name: Checkout repo + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + + - name: Configure aws credentials + uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 + with: + role-to-assume: ${{ secrets.AWS_ROLE_ARN_GATI }} + role-duration-seconds: ${{ secrets.AWS_ROLE_DURATION_SECONDS }} + aws-region: ${{ secrets.AWS_REGION }} + mask-aws-account-id: true + role-session-name: helm-publish.helm-release + + - name: Get Github Token + id: get-gh-token + uses: smartcontractkit/chainlink-github-actions/github-app-token-issuer@5874ff7211cf5a5a2670bb010fbff914eaaae138 # v2.3.12 + with: + url: ${{ secrets.GATI_LAMBDA_FUNCTION_URL }} + + ci-lint-charts: + runs-on: ubuntu-latest + steps: + - name: ci-lint-charts + uses: smartcontractkit/.github/actions/ci-lint-charts@6b08487b176ef7cad086526d0b54ddff6691c044 # ci-lint-charts@0.1.2 + with: + # grafana inputs + metrics-job-name: ci-lint-charts + gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} + gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} + cicd-build-publish-charts: + runs-on: ubuntu-latest + permissions: + id-token: write + contents: read + actions: read + steps: + - name: cicd-build-publish-charts + uses: smartcontractkit/.github/actions/cicd-build-publish-charts@5b1046c28343660ecb84844c6fa95a66d1cdb52e # cicd-build-publish-charts@0.1.2 + with: + # general inputs + charts-dir: chart + publish: "true" + # grafana inputs + metrics-job-name: cicd-build-publish-charts + gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} + gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }} + gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} + # aws inputs + aws-region: ${{ secrets.AWS_REGION }} + aws-role-arn: ${{ secrets.AWS_OIDC_IAM_ROLE_PUBLISH_CHART_PROD_ARN }} + aws-account-number: ${{ secrets.AWS_ACCOUNT_ID_PROD }} \ No newline at end of file diff --git a/.github/workflows/helm-chart-publish.yml b/.github/workflows/helm-chart-publish.yml deleted file mode 100644 index 927ed4b0166..00000000000 --- a/.github/workflows/helm-chart-publish.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Helm Publish - -on: - workflow_dispatch: - -jobs: - helm_release: - runs-on: ubuntu-latest - environment: build-develop - permissions: - id-token: write - contents: read - steps: - - name: Checkout repo - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - - name: Configure aws credentials - uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 - with: - role-to-assume: ${{ secrets.AWS_ROLE_ARN_GATI }} - role-duration-seconds: ${{ secrets.AWS_ROLE_DURATION_SECONDS }} - aws-region: ${{ secrets.AWS_REGION }} - mask-aws-account-id: true - role-session-name: helm-publish.helm-release - - - name: Get Github Token - id: get-gh-token - uses: smartcontractkit/chainlink-github-actions/github-app-token-issuer@5874ff7211cf5a5a2670bb010fbff914eaaae138 # v2.3.12 - with: - url: ${{ secrets.GATI_LAMBDA_FUNCTION_URL }} - - - name: Install Helm - uses: azure/setup-helm@b7246b12e77f7134dc2d460a3d5bad15bbe29390 # v4.1.0 - - - name: Run chart-releaser - uses: helm/chart-releaser-action@a917fd15b20e8b64b94d9158ad54cd6345335584 # v1.6.0 - with: - charts_dir: charts - config: .github/cr.yaml - env: - CR_TOKEN: "${{ steps.get-gh-token.outputs.access-token }}" diff --git a/charts/chainlink-cluster/.gitignore b/charts/crib-chainlink-cluster/.gitignore similarity index 100% rename from charts/chainlink-cluster/.gitignore rename to charts/crib-chainlink-cluster/.gitignore diff --git a/charts/chainlink-cluster/.helmignore b/charts/crib-chainlink-cluster/.helmignore similarity index 100% rename from charts/chainlink-cluster/.helmignore rename to charts/crib-chainlink-cluster/.helmignore diff --git a/charts/chainlink-cluster/Chart.lock b/charts/crib-chainlink-cluster/Chart.lock similarity index 100% rename from charts/chainlink-cluster/Chart.lock rename to charts/crib-chainlink-cluster/Chart.lock diff --git a/charts/chainlink-cluster/Chart.yaml b/charts/crib-chainlink-cluster/Chart.yaml similarity index 81% rename from charts/chainlink-cluster/Chart.yaml rename to charts/crib-chainlink-cluster/Chart.yaml index fa45ea9bd77..8e70c34279c 100644 --- a/charts/chainlink-cluster/Chart.yaml +++ b/charts/crib-chainlink-cluster/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -name: chainlink-cluster -description: Chainlink nodes cluster -version: 0.4.0 -appVersion: "2.6.0" +name: crib-chainlink-cluster +description: Chainlink nodes cluster for Integration level testing +version: 0.5.0 +appVersion: "2.10.0" dependencies: - name: mockserver version: "5.14.0" diff --git a/charts/chainlink-cluster/README.md b/charts/crib-chainlink-cluster/README.md similarity index 100% rename from charts/chainlink-cluster/README.md rename to charts/crib-chainlink-cluster/README.md diff --git a/charts/chainlink-cluster/templates/chainlink-cm.yaml b/charts/crib-chainlink-cluster/templates/chainlink-cm.yaml similarity index 100% rename from charts/chainlink-cluster/templates/chainlink-cm.yaml rename to charts/crib-chainlink-cluster/templates/chainlink-cm.yaml diff --git a/charts/chainlink-cluster/templates/chainlink-db-deployment.yaml b/charts/crib-chainlink-cluster/templates/chainlink-db-deployment.yaml similarity index 100% rename from charts/chainlink-cluster/templates/chainlink-db-deployment.yaml rename to charts/crib-chainlink-cluster/templates/chainlink-db-deployment.yaml diff --git a/charts/chainlink-cluster/templates/chainlink-db-networkpolicy.yaml b/charts/crib-chainlink-cluster/templates/chainlink-db-networkpolicy.yaml similarity index 100% rename from charts/chainlink-cluster/templates/chainlink-db-networkpolicy.yaml rename to charts/crib-chainlink-cluster/templates/chainlink-db-networkpolicy.yaml diff --git a/charts/chainlink-cluster/templates/chainlink-db-service.yaml b/charts/crib-chainlink-cluster/templates/chainlink-db-service.yaml similarity index 100% rename from charts/chainlink-cluster/templates/chainlink-db-service.yaml rename to charts/crib-chainlink-cluster/templates/chainlink-db-service.yaml diff --git a/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml b/charts/crib-chainlink-cluster/templates/chainlink-node-deployment.yaml similarity index 100% rename from charts/chainlink-cluster/templates/chainlink-node-deployment.yaml rename to charts/crib-chainlink-cluster/templates/chainlink-node-deployment.yaml diff --git a/charts/chainlink-cluster/templates/chainlink-node-networkpolicy.yaml b/charts/crib-chainlink-cluster/templates/chainlink-node-networkpolicy.yaml similarity index 100% rename from charts/chainlink-cluster/templates/chainlink-node-networkpolicy.yaml rename to charts/crib-chainlink-cluster/templates/chainlink-node-networkpolicy.yaml diff --git a/charts/chainlink-cluster/templates/chainlink-node-service.yaml b/charts/crib-chainlink-cluster/templates/chainlink-node-service.yaml similarity index 100% rename from charts/chainlink-cluster/templates/chainlink-node-service.yaml rename to charts/crib-chainlink-cluster/templates/chainlink-node-service.yaml diff --git a/charts/chainlink-cluster/templates/chainlink-pod-monitor.yaml b/charts/crib-chainlink-cluster/templates/chainlink-pod-monitor.yaml similarity index 100% rename from charts/chainlink-cluster/templates/chainlink-pod-monitor.yaml rename to charts/crib-chainlink-cluster/templates/chainlink-pod-monitor.yaml diff --git a/charts/chainlink-cluster/templates/chainlink-secret.yaml b/charts/crib-chainlink-cluster/templates/chainlink-secret.yaml similarity index 100% rename from charts/chainlink-cluster/templates/chainlink-secret.yaml rename to charts/crib-chainlink-cluster/templates/chainlink-secret.yaml diff --git a/charts/chainlink-cluster/templates/geth-config-map.yaml b/charts/crib-chainlink-cluster/templates/geth-config-map.yaml similarity index 100% rename from charts/chainlink-cluster/templates/geth-config-map.yaml rename to charts/crib-chainlink-cluster/templates/geth-config-map.yaml diff --git a/charts/chainlink-cluster/templates/geth-deployment.yaml b/charts/crib-chainlink-cluster/templates/geth-deployment.yaml similarity index 100% rename from charts/chainlink-cluster/templates/geth-deployment.yaml rename to charts/crib-chainlink-cluster/templates/geth-deployment.yaml diff --git a/charts/chainlink-cluster/templates/geth-networkpolicy.yaml b/charts/crib-chainlink-cluster/templates/geth-networkpolicy.yaml similarity index 100% rename from charts/chainlink-cluster/templates/geth-networkpolicy.yaml rename to charts/crib-chainlink-cluster/templates/geth-networkpolicy.yaml diff --git a/charts/chainlink-cluster/templates/geth-service.yaml b/charts/crib-chainlink-cluster/templates/geth-service.yaml similarity index 100% rename from charts/chainlink-cluster/templates/geth-service.yaml rename to charts/crib-chainlink-cluster/templates/geth-service.yaml diff --git a/charts/chainlink-cluster/templates/ingress.yaml b/charts/crib-chainlink-cluster/templates/ingress.yaml similarity index 100% rename from charts/chainlink-cluster/templates/ingress.yaml rename to charts/crib-chainlink-cluster/templates/ingress.yaml diff --git a/charts/chainlink-cluster/templates/mockserver-networkpolicy.yaml b/charts/crib-chainlink-cluster/templates/mockserver-networkpolicy.yaml similarity index 100% rename from charts/chainlink-cluster/templates/mockserver-networkpolicy.yaml rename to charts/crib-chainlink-cluster/templates/mockserver-networkpolicy.yaml diff --git a/charts/chainlink-cluster/templates/networkpolicy-default.yaml b/charts/crib-chainlink-cluster/templates/networkpolicy-default.yaml similarity index 100% rename from charts/chainlink-cluster/templates/networkpolicy-default.yaml rename to charts/crib-chainlink-cluster/templates/networkpolicy-default.yaml diff --git a/charts/chainlink-cluster/templates/tests/test-connection.yaml b/charts/crib-chainlink-cluster/templates/tests/test-connection.yaml similarity index 100% rename from charts/chainlink-cluster/templates/tests/test-connection.yaml rename to charts/crib-chainlink-cluster/templates/tests/test-connection.yaml diff --git a/charts/chainlink-cluster/values.yaml b/charts/crib-chainlink-cluster/values.yaml similarity index 100% rename from charts/chainlink-cluster/values.yaml rename to charts/crib-chainlink-cluster/values.yaml diff --git a/lintconf.yaml b/lintconf.yaml index ff37371d476..f473007450c 100644 --- a/lintconf.yaml +++ b/lintconf.yaml @@ -2,6 +2,8 @@ # Copied from: # https://redhat-cop.github.io/ci/linting-testing-helm-charts.html # with `min-spaces-from-content` changed to be compatible with prettier. +target-branch: develop +check-version-increment: true rules: braces: min-spaces-inside: 0