Merge branch 'main' into amcamina/customize_rbca

2024-03-01 09:11:22 +09:00 · 2024-03-01 09:11:22 +09:00 · 214771848f
commit 214771848f
parent a1f19d7837 09679ae4d3
13 changed files with 147 additions and 110 deletions
--- a/.github/configs/renovate-config.js
+++ b/.github/configs/renovate-config.js
@ -0,0 +1,7 @@
+module.exports = {
+    platform: 'github',
+    gitAuthor: 'renovate[bot] <renovate[bot]@users.noreply.github.com>',
+    autodiscover: false,
+    allowPostUpgradeCommandTemplating: true,
+    allowedPostUpgradeCommands: [".*"],
+  };
--- a/.github/workflows/chart-version-bump.yml
+++ b/.github/workflows/chart-version-bump.yml
@ -1,57 +0,0 @@
-## Used on Renovate PRs to bump the chart version and add a changelog entry
-## Reference: https://github.com/stefanzweifel/git-auto-commit-action
-## Reference: https://github.com/marketplace/actions/changed-files
-name: 'Chart Version Bump and Changelog'
-
-on:
-  pull_request:
-    types:
-      - labeled
-
-permissions:
-  contents: write
-
-jobs:
-  helm-bumper:
-    if: ${{ (contains(github.event.pull_request.labels.*.name, 'renovate')) }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          token: ${{ secrets.PAT }}
-          fetch-depth: 0
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@3f54ebb830831fc121d3263c1857cfbdc310cdb9 # v42.0.4
-        with:
-          files: charts/{argo-workflows,argo-cd,argo-events,argo-rollouts,argocd-image-updater}/Chart.yaml
-
-      - name: "Bump Version and Changelog"
-        run: |
-          chartName="$(echo \"${{ steps.changed-files.outputs.all_changed_files }}\" | cut -d '/' -f2)"
-          echo "Changed chart name is: $chartName"
-          echo "----------------------------------------"
-
-          parentDir="charts/${chartName}"
-
-          # Bump the chart version by one patch version
-          version=$(grep '^version:' ${parentDir}/Chart.yaml | awk '{print $2}')
-          major=$(echo $version | cut -d. -f1)
-          minor=$(echo $version | cut -d. -f2)
-          patch=$(echo $version | cut -d. -f3)
-          patch=$(expr $patch + 1)
-          sed -i "s/^version:.*/version: ${major}.${minor}.${patch}/g" ${parentDir}/Chart.yaml
-
-          # Add a changelog entry
-          appVersion=$(grep '^appVersion:' ${parentDir}/Chart.yaml | awk '{print $2}')
-          sed -i -e '/^  artifacthub.io\/changes: |/,$d' ${parentDir}/Chart.yaml
-          echo "  artifacthub.io/changes: |" >> ${parentDir}/Chart.yaml
-          echo "    - kind: changed" >> ${parentDir}/Chart.yaml
-          echo "      description: Bump ${chartName} to ${appVersion}" >> ${parentDir}/Chart.yaml
-          cat ${parentDir}/Chart.yaml
-
-      - name: "Commit and push changes"
-        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # v5.0.0
-        with:
-          commit_options: '--signoff'
--- a/.github/workflows/renovate.yaml
+++ b/.github/workflows/renovate.yaml
@ -0,0 +1,36 @@
+name: Renovate
+on:
+  # The "*" (#42, asterisk) character has special semantics in YAML, so this
+  # string has to be quoted.
+  schedule:
+    - cron: '0 * * * *'
+  # Manual trigger is also possible
+  workflow_dispatch: {}
+
+permissions:
+  contents: read
+
+jobs:
+  renovate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get token
+        uses: actions/create-github-app-token@e8e39f73bb84fdf315a015fa3104f314c0a258b4 # v1.8.1
+        id: get_token
+        with:
+          app-id: ${{ vars.RENOVATE_APP_ID }}
+          private-key: ${{ secrets.RENOVATE_APP_PRIVATE_KEY }}
+
+      - name: Checkout
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Self-hosted Renovate
+        uses: renovatebot/github-action@a6e57359b32af9a54d5b3b6603011f50629a0a05 # v40.1.2
+        with:
+          configurationFile: .github/configs/renovate-config.js
+          # renovate: datasource=docker depName=ghcr.io/renovatebot/renovate
+          renovate-version: 37.221.0
+          token: '${{ steps.get_token.outputs.token }}'
+        env:
+          LOG_LEVEL: 'debug'
+          RENOVATE_REPOSITORIES: '${{ github.repository }}'
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@ -3,7 +3,7 @@ appVersion: v2.10.1
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 6.4.2
+version: 6.5.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@ -26,5 +26,5 @@ annotations:
    fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
    url: https://argoproj.github.io/argo-helm/pgp_keys.asc
  artifacthub.io/changes: |
-    - kind: fixed
-      description: Pass argocd-server's ALB health check
+    - kind: added
+      description: Support for templating ingress extraPaths and extraRules
--- a/charts/argo-cd/templates/argocd-applicationset/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-applicationset/ingress.yaml
@ -24,7 +24,7 @@ spec:
      http:
        paths:
          {{- with .Values.applicationSet.ingress.extraPaths }}
-            {{- toYaml . | nindent 10 }}
+            {{- tpl (toYaml .) $ | nindent 10 }}
          {{- end }}
          - path: {{ .Values.applicationSet.ingress.path }}
            pathType: {{ .Values.applicationSet.ingress.pathType }}
@ -46,7 +46,7 @@ spec:
                  number: {{ $.Values.applicationSet.service.port }}
    {{- end }}
    {{- with .Values.applicationSet.ingress.extraRules }}
-      {{- toYaml . | nindent 4 }}
+      {{- tpl (toYaml .) $ | nindent 4 }}
    {{- end }}
  {{- if or .Values.applicationSet.ingress.tls .Values.applicationSet.ingress.extraTls }}
  tls:
--- a/charts/argo-cd/templates/argocd-server/aws/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/aws/ingress.yaml
@ -26,7 +26,7 @@ spec:
      http:
        paths:
          {{- with .Values.server.ingress.extraPaths }}
-            {{- toYaml . | nindent 10 }}
+            {{- tpl (toYaml .) $ | nindent 10 }}
          {{- end }}
          - path: {{ .Values.server.ingress.path }}
            pathType: {{ $.Values.server.ingressGrpc.pathType }}
@ -55,7 +55,7 @@ spec:
                  number: {{ $servicePort }}
    {{- end }}
    {{- with .Values.server.ingress.extraRules }}
-      {{- toYaml . | nindent 4 }}
+      {{- tpl (toYaml .) $ | nindent 4 }}
    {{- end }}
  {{- if or .Values.server.ingress.tls .Values.server.ingress.extraTls }}
  tls:
--- a/charts/argo-cd/templates/argocd-server/gke/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/gke/ingress.yaml
@ -31,7 +31,7 @@ spec:
      http:
        paths:
          {{- with .Values.server.ingress.extraPaths }}
-            {{- toYaml . | nindent 10 }}
+            {{- tpl (toYaml .) $ | nindent 10 }}
          {{- end }}
          - path: {{ .Values.server.ingress.path }}
            pathType: {{ .Values.server.ingress.pathType }}
@ -53,7 +53,7 @@ spec:
                  number: {{ $servicePort }}
    {{- end }}
    {{- with .Values.server.ingress.extraRules }}
-      {{- toYaml . | nindent 4 }}
+      {{- tpl (toYaml .) $ | nindent 4 }}
    {{- end }}
  {{- if or .Values.server.ingress.tls .Values.server.ingress.extraTls }}
  tls:
--- a/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
@ -25,7 +25,7 @@ spec:
      http:
        paths:
          {{- with .Values.server.ingressGrpc.extraPaths }}
-            {{- toYaml . | nindent 10 }}
+            {{- tpl (toYaml .) $ | nindent 10 }}
          {{- end }}
          - path: {{ .Values.server.ingressGrpc.path }}
            pathType: {{ .Values.server.ingressGrpc.pathType }}
@ -47,7 +47,7 @@ spec:
                  number: {{ $.Values.server.service.servicePortHttps }}
    {{- end }}
    {{- with .Values.server.ingressGrpc.extraRules }}
-      {{- toYaml . | nindent 4 }}
+      {{- tpl (toYaml .) $ | nindent 4 }}
    {{- end }}
  {{- if or .Values.server.ingressGrpc.tls .Values.server.ingressGrpc.extraTls }}
  tls:
--- a/charts/argo-cd/templates/argocd-server/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress.yaml
@ -26,7 +26,7 @@ spec:
      http:
        paths:
          {{- with .Values.server.ingress.extraPaths }}
-            {{- toYaml . | nindent 10 }}
+            {{- tpl (toYaml .) $ | nindent 10 }}
          {{- end }}
          - path: {{ .Values.server.ingress.path }}
            pathType: {{ $.Values.server.ingress.pathType }}
@ -48,7 +48,7 @@ spec:
                  number: {{ $servicePort }}
    {{- end }}
    {{- with .Values.server.ingress.extraRules }}
-      {{- toYaml . | nindent 4 }}
+      {{- tpl (toYaml .) $ | nindent 4 }}
    {{- end }}
  {{- if or .Values.server.ingress.tls .Values.server.ingress.extraTls }}
  tls:
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@ -2038,6 +2038,7 @@ server:

    # -- Additional ingress paths
    # @default -- `[]` (See [values.yaml])
+    ## Note: Supports use of custom Helm templates
    extraPaths: []
      # - path: /*
      #   pathType: Prefix
@ -2049,15 +2050,17 @@ server:

    # -- Additional ingress rules
    # @default -- `[]` (See [values.yaml])
+    ## Note: Supports use of custom Helm templates
    extraRules: []
-      # - host: example.example.com
-      #   http:
-      #       path: /
+      # - http:
+      #     paths:
+      #     - path: /
+      #       pathType: Prefix
      #       backend:
      #         service:
-      #           name: example-svc
+      #           name: '{{ include "argo-cd.server.fullname" . }}'
      #           port:
-      #             name: http
+      #             name: '{{ .Values.server.service.servicePortHttpsName }}'

    # -- Additional TLS configuration
    # @default -- `[]` (See [values.yaml])
@ -2144,6 +2147,7 @@ server:

    # -- Additional ingress paths for dedicated [gRPC-ingress]
    # @default -- `[]` (See [values.yaml])
+    ## Note: Supports use of custom Helm templates
    extraPaths: []
      # - path: /*
      #   pathType: Prefix
@ -2155,15 +2159,17 @@ server:

    # -- Additional ingress rules
    # @default -- `[]` (See [values.yaml])
+    ## Note: Supports use of custom Helm templates
    extraRules: []
-      # - host: example.example.com
-      #   http:
-      #       path: /
+      # - http:
+      #     paths:
+      #     - path: /
+      #       pathType: Prefix
      #       backend:
      #         service:
-      #           name: example-svc
+      #           name: '{{ include "argo-cd.server.fullname" . }}'
      #           port:
-      #             name: http
+      #             name: '{{ .Values.server.service.servicePortHttpName }}'

    # -- Additional TLS configuration for dedicated [gRPC-ingress]
    # @default -- `[]` (See [values.yaml])
@ -2904,15 +2910,17 @@ applicationSet:

    # -- Additional ingress rules
    # @default -- `[]` (See [values.yaml])
+    ## Note: Supports use of custom Helm templates
    extraRules: []
-      # - host: example.example.com
-      #   http:
-      #       path: /
-      #       backend:
-      #         service:
-      #           name: example-svc
-      #           port:
-      #             name: http
+      # - http:
+      #    paths:
+      #    - path: /api/webhook
+      #      pathType: Prefix
+      #      backend:
+      #        service:
+      #          name: '{{ include "argo-cd.applicationSet.fullname" . }}'
+      #          port:
+      #            name: '{{ .Values.applicationSet.service.portName }}'

    # -- Additional ingress TLS configuration
    # @default -- `[]` (See [values.yaml])
--- a/charts/argo-workflows/Chart.yaml
+++ b/charts/argo-workflows/Chart.yaml
@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: v3.5.4
+appVersion: v3.5.5
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.40.11
+version: 0.40.12
 icon: https://argo-workflows.readthedocs.io/en/stable/assets/logo.png
 home: https://github.com/argoproj/argo-helm
 sources:
@ -16,5 +16,5 @@ annotations:
    fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
    url: https://argoproj.github.io/argo-helm/pgp_keys.asc
  artifacthub.io/changes: |
-    - kind: fixed
-      description: Add caSecret in the artifactory.s3 configuration values.
+    - kind: changed
+      description: Bump argo-workflows to v3.5.5
--- a/renovate.json
+++ b/renovate.json
@ -4,7 +4,7 @@
    "fileMatch": ["\\.yaml$", "\\.yml$"]
  },
  "extends": [
-    "config:base",
+    "config:recommended",
    "docker:enableMajor"
  ],
  "labels": ["renovate"],
@ -13,10 +13,12 @@
    "**/charts/argo-cd/Chart.yaml",
    "**/charts/argo-events/Chart.yaml",
    "**/charts/argo-rollouts/Chart.yaml",
-    "**/charts/argocd-image-updater/Chart.yaml"
+    "**/charts/argocd-image-updater/Chart.yaml",
+    "**/.github/workflows/renovate.yaml"
  ],
-  "regexManagers": [
+  "customManagers": [
    {
+      "customType": "regex",
      "fileMatch": ["charts/argo-workflows/Chart.yaml$"],
      "matchStrings": [
        "\\sappVersion: (?<currentValue>.*)\\s"
@ -26,6 +28,7 @@
      "datasourceTemplate": "github-releases"
    },
    {
+      "customType": "regex",
      "fileMatch": ["charts/argo-cd/Chart.yaml$"],
      "matchStrings": [
        "\\sappVersion: (?<currentValue>.*)\\s"
@ -35,6 +38,7 @@
      "datasourceTemplate": "github-releases"
    },
    {
+      "customType": "regex",
      "fileMatch": ["charts/argo-events/Chart.yaml$"],
      "matchStrings": [
        "\\sappVersion: (?<currentValue>.*)\\s"
@ -44,6 +48,7 @@
      "datasourceTemplate": "github-releases"
    },
    {
+      "customType": "regex",
      "fileMatch": ["charts/argo-rollouts/Chart.yaml$"],
      "matchStrings": [
        "\\sappVersion: (?<currentValue>.*)\\s"
@ -53,6 +58,7 @@
      "datasourceTemplate": "github-releases"
    },
    {
+      "customType": "regex",
      "fileMatch": ["charts/argocd-image-updater/Chart.yaml$"],
      "matchStrings": [
        "\\sappVersion: (?<currentValue>.*)\\s"
@ -60,28 +66,34 @@
      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}",
      "depNameTemplate": "argoproj-labs/argocd-image-updater",
      "datasourceTemplate": "github-releases"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["^\\.github/workflows/[^/]+\\.ya?ml$"],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s+.+version: (?<currentValue>.*)"
+      ]
    }
  ],
  "packageRules": [
    {
-      "matchPackagePatterns": ["argoproj/argo-workflows"],
-      "commitMessagePrefix": "chore(argo-workflows):"
-    },
-    {
-      "matchPackagePatterns": ["argoproj/argo-cd"],
-      "commitMessagePrefix": "chore(argo-cd):"
-    },
-    {
-      "matchPackagePatterns": ["argoproj/argo-events"],
-      "commitMessagePrefix": "chore(argo-events):"
-    },
-    {
-      "matchPackagePatterns": ["argoproj/argo-rollouts"],
-      "commitMessagePrefix": "chore(argo-rollouts):"
+      "matchPackagePatterns": [
+        "argoproj/argo-workflows",
+        "argoproj/argo-cd",
+        "argoproj/argo-events",
+        "argoproj/argo-rollouts"
+      ],
+      "commitMessagePrefix": "chore({{{replace 'argoproj/' '' depName}}}):",
+      "postUpgradeTasks": {
+        "commands": ["./scripts/renovate-bump-version.sh {{depName}}"]
+      }
    },
    {
      "matchPackagePatterns": ["argoproj-labs/argocd-image-updater"],
-      "commitMessagePrefix": "chore(argocd-image-updater):"
+      "commitMessagePrefix": "chore({{{replace 'argoproj-labs/' '' depName}}}):",
+      "postUpgradeTasks": {
+        "commands": ["./scripts/renovate-bump-version.sh {{depName}}"]
+      }
    },
    {
      "matchPackagePatterns": ["redis-ha"],
--- a/scripts/renovate-bump-version.sh
+++ b/scripts/renovate-bump-version.sh
@ -0,0 +1,31 @@
+#!/bin/bash
+depName="${1}"
+if [ -z "${depName}" ]; then
+  echo "Missing argument 'depName'" >&2
+  echo "Example usage: $0 argoproj/argo-cd" >&2
+  exit 1
+fi
+
+chartName=$(echo "$depName" | sed -e "s+^argoproj/++" -e "s+^argoproj-labs/++")
+echo "Changed chart name is: $chartName"
+echo "----------------------------------------"
+
+parentDir="charts/${chartName}"
+
+# Bump the chart version by one patch version
+version=$(grep '^version:' "${parentDir}/Chart.yaml" | awk '{print $2}')
+major=$(echo "${version}" | cut -d. -f1)
+minor=$(echo "${version}" | cut -d. -f2)
+patch=$(echo "${version}" | cut -d. -f3)
+patch=$((patch + 1))
+sed -i "s/^version:.*/version: ${major}.${minor}.${patch}/g" "${parentDir}/Chart.yaml"
+
+# Add a changelog entry
+appVersion=$(grep '^appVersion:' "${parentDir}/Chart.yaml" | awk '{print $2}')
+sed -i -e '/^  artifacthub.io\/changes: |/,$ d' "${parentDir}/Chart.yaml"
+{
+  echo "  artifacthub.io/changes: |"
+  echo "    - kind: changed"
+  echo "      description: Bump ${chartName} to ${appVersion}"
+} >> "${parentDir}/Chart.yaml"
+cat "${parentDir}/Chart.yaml"