diff --git a/.github/workflows/add-asana-comment.yml b/.github/workflows/add-asana-comment.yml deleted file mode 100644 index eb12d43f97..0000000000 --- a/.github/workflows/add-asana-comment.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: - pull_request: - types: [opened, closed, reopened] - -jobs: - create-comment-in-asana-task-job: - runs-on: ubuntu-latest - name: Create a comment in Asana Task - steps: - - name: Create a comment - uses: Asana/comment-on-task-github-action@latest - id: createComment - with: - asana-secret: ${{ secrets.ASANA_SECRET }} - comment-text: "{{PR_NAME}} is {{PR_STATE}}: {{PR_URL}}" - - name: Get status - run: echo "Status is ${{ steps.createComment.outputs.status }}" diff --git a/charts/console/Chart.lock b/charts/console/Chart.lock index fdbd4f46ae..b6141216b7 100644 --- a/charts/console/Chart.lock +++ b/charts/console/Chart.lock @@ -5,5 +5,8 @@ dependencies: - name: controller repository: file://../controller version: 0.0.20 -digest: sha256:adc3feb57d179eb46be70f35560655f9f25da37c1bc856801e0139d3893a01c7 -generated: "2024-03-04T19:25:14.184405624Z" +- name: flux2 + repository: https://fluxcd-community.github.io/helm-charts + version: 2.11.1 +digest: sha256:89336104f2252bd6796d3f61fac7c0b2c9abe149dd456b92a5496afa5ac027a4 +generated: "2024-03-04T16:41:22.223231-05:00" diff --git a/charts/console/Chart.yaml b/charts/console/Chart.yaml index 70be20f5fb..7dcc8c87ad 100644 --- a/charts/console/Chart.yaml +++ b/charts/console/Chart.yaml @@ -3,7 +3,7 @@ name: console description: >- deploys the plural console and additional dependencies, for use in bring-your-own-kube setups appVersion: 0.8.14 -version: 0.1.38 +version: 0.1.39 dependencies: - name: kas version: 0.0.5 @@ -11,4 +11,8 @@ dependencies: - name: controller version: 0.0.20 repository: file://../controller + - name: flux2 + repository: https://fluxcd-community.github.io/helm-charts + version: 2.11.1 + condition: flux2.enabled type: application diff --git a/charts/console/charts/controller-0.0.20.tgz b/charts/console/charts/controller-0.0.20.tgz index 8c3e41bd56..17665eb7df 100644 Binary files a/charts/console/charts/controller-0.0.20.tgz and b/charts/console/charts/controller-0.0.20.tgz differ diff --git a/charts/console/charts/flux2-2.11.1.tgz b/charts/console/charts/flux2-2.11.1.tgz new file mode 100644 index 0000000000..e6f7412cd5 Binary files /dev/null and b/charts/console/charts/flux2-2.11.1.tgz differ diff --git a/charts/console/charts/kas-0.0.5.tgz b/charts/console/charts/kas-0.0.5.tgz index 97d638c88c..d2da6c0b0f 100644 Binary files a/charts/console/charts/kas-0.0.5.tgz and b/charts/console/charts/kas-0.0.5.tgz differ diff --git a/charts/console/values.yaml b/charts/console/values.yaml index 70f296c91b..a30c83f9a3 100644 --- a/charts/console/values.yaml +++ b/charts/console/values.yaml @@ -221,3 +221,20 @@ dashboard: # namespaced: true provider: custom + +flux2: + enabled: false + helmController: + create: false + imageAutomationController: + create: false + imageReflectionController: + create: false + kustomizeController: + create: false + notificationController: + create: false + sourceController: + create: true + policies: + create: false \ No newline at end of file diff --git a/templates/values.yaml.liquid b/templates/values.yaml.liquid index 7bec7ca1f5..4b82a3b782 100644 --- a/templates/values.yaml.liquid +++ b/templates/values.yaml.liquid @@ -40,6 +40,9 @@ extraSecretEnv: POSTGRES_URL: {{ configuration.postgresUrl }} CONSOLE_BYOK: 'true' +flux2: + enabled: true + kas: enabled: true consoleUrl: {{ configuration.consoleDns }}