fix: update plugin chart values with new metrics service targetPort (#457)

Metrics server is exposed on port 8443. This PR updates the metrics
service chart value for validator and all plugins to match this, to
ensure it's accessible.

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

Author: arturshadnik

build

@@ -24,7 +24,7 @@ The following table lists the configurable parameters of the Validator chart and
 | `controllerManager.replicas` |  | `1` |
 | `controllerManager.serviceAccount.annotations` |  | `{}` |
 | `kubernetesClusterDomain` |  | `"cluster.local"` |
-| `metricsService.ports` |  | `[{"name": "https", "port": 8443, "protocol": "TCP", "targetPort": "https"}]` |
+| `metricsService.ports` |  | `[{"name": "https", "port": 8443, "protocol": "TCP", "targetPort": 8443}]` |
 | `metricsService.type` |  | `"ClusterIP"` |
 | `env` |  | `[]` |
 | `proxy.enabled` |  | `false` |
@@ -45,7 +45,7 @@ The following table lists the configurable parameters of the Validator chart and
 | `pluginSecrets.oci.pubKeys` | Don't forget to delete these square brackets if you're specifying public keys here! | `[]` |
 | `pluginSecrets.vSphere` | Don't forget to delete these curly braces if you're specifying credentials here! | `{}` |
 | `helmConfig.registry` |  | `"https://validator-labs.github.io"` |
-| `plugins` |  | `[{"chart": {"name": "validator-plugin-azure", "repository": "validator-plugin-azure", "version": "v0.0.25"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-azure\n      tag: v0.0.25\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n    # Optionally specify a volumeMount to mount a volume containing a private key\n    # to leverage Azure Service principal with certificate authentication.\n    volumeMounts: []\n  replicas: 1\n  serviceAccount:\n    annotations: {}\n  # Optionally specify a volume containing a private key to leverage Azure Service\n  # principal with certificate authentication.\n  volumes: []\n  # Optionally specify additional labels to use for the controller-manager Pods.\n  podLabels: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: https\n  type: ClusterIP\nauth:\n  # Override the service account used by Azure validator (optional, could be used for WorkloadIdentityCredentials on AKS)\n  # WARNING: the chosen service account must include all RBAC privileges found in templates/manager-rbac.yaml\n  serviceAccountName: \"\"\n# Optionally specify the Azure environment to use. Defaults to \"AzureCloud\" for public Azure cloud.\n# Other acceptable values are \"AzureUSGovernment\" and \"AzureChinaCloud\".\nazureEnvironment: \"AzureCloud\""}, {"chart": {"name": "validator-plugin-oci", "repository": "validator-plugin-oci", "version": "v0.3.4"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-oci\n      tag: v0.3.4\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n  replicas: 1\n  serviceAccount:\n    annotations: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: https\n  type: ClusterIP"}, {"chart": {"name": "validator-plugin-kubescape", "repository": "validator-plugin-kubescape", "version": "v0.0.5"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-kubescape\n      tag: v0.0.5\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n    # Optionally specify a volumeMount to mount a volume containing a private key\n    # to leverage Azure Service principal with certificate authentication.\n    volumeMounts: []\n  replicas: 1\n  serviceAccount:\n    annotations: {}\n  # Optionally specify a volume containing a private key to leverage Azure Service\n  # principal with certificate authentication.\n  volumes: []\n  # Optionally specify additional labels to use for the controller-manager Pods.\n  podLabels: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: https\n  type: ClusterIP"}, {"chart": {"name": "validator-plugin-aws", "repository": "validator-plugin-aws", "version": "v0.1.11"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-aws\n      tag: v0.1.11\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n  replicas: 1\n  serviceAccount:\n    annotations: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: https\n  type: ClusterIP\nauth:\n  # Override the service account used by AWS validator (optional, could be used for IAM roles for Service Accounts)\n  # WARNING: the chosen service account must have the same RBAC privileges as seen in templates/manager-rbac.yaml\n  serviceAccountName: \"\""}, {"chart": {"name": "validator-plugin-network", "repository": "validator-plugin-network", "version": "v0.1.1"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: true\n      capabilities:\n        add:\n          - NET_RAW\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-network\n      tag: v0.1.1\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n  replicas: 1\n  serviceAccount:\n    annotations: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: https\n  type: ClusterIP"}, {"chart": {"name": "validator-plugin-maas", "repository": "validator-plugin-maas", "version": "v0.0.13"}, "values": "controllerManager:\n  manager:\n    args:\n      - --metrics-bind-address=:8443\n      - --health-probe-bind-address=:8081\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-maas\n      tag: v0.0.13\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n  replicas: 1\n  serviceAccount:\n    annotations: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: 8443\n  type: ClusterIP"}, {"chart": {"name": "validator-plugin-vsphere", "repository": "validator-plugin-vsphere", "version": "v0.1.5"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-vsphere\n      tag: v0.1.5\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n  replicas: 1\n  serviceAccount:\n    annotations: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: https\n  type: ClusterIP"}]` |
+| `plugins` |  | `[{"chart": {"name": "validator-plugin-azure", "repository": "validator-plugin-azure", "version": "v0.0.26"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-azure\n      tag: v0.0.26\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n    # Optionally specify a volumeMount to mount a volume containing a private key\n    # to leverage Azure Service principal with certificate authentication.\n    volumeMounts: []\n  replicas: 1\n  serviceAccount:\n    annotations: {}\n  # Optionally specify a volume containing a private key to leverage Azure Service\n  # principal with certificate authentication.\n  volumes: []\n  # Optionally specify additional labels to use for the controller-manager Pods.\n  podLabels: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: 8443\n  type: ClusterIP\nauth:\n  # Override the service account used by Azure validator (optional, could be used for WorkloadIdentityCredentials on AKS)\n  # WARNING: the chosen service account must include all RBAC privileges found in templates/manager-rbac.yaml\n  serviceAccountName: \"\"\n# Optionally specify the Azure environment to use. Defaults to \"AzureCloud\" for public Azure cloud.\n# Other acceptable values are \"AzureUSGovernment\" and \"AzureChinaCloud\".\nazureEnvironment: \"AzureCloud\""}, {"chart": {"name": "validator-plugin-oci", "repository": "validator-plugin-oci", "version": "v0.3.5"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-oci\n      tag: v0.3.5\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n  replicas: 1\n  serviceAccount:\n    annotations: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: 8443\n  type: ClusterIP"}, {"chart": {"name": "validator-plugin-kubescape", "repository": "validator-plugin-kubescape", "version": "v0.0.6"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-kubescape\n      tag: v0.0.6\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n    # Optionally specify a volumeMount to mount a volume containing a private key\n    # to leverage Azure Service principal with certificate authentication.\n    volumeMounts: []\n  replicas: 1\n  serviceAccount:\n    annotations: {}\n  # Optionally specify a volume containing a private key to leverage Azure Service\n  # principal with certificate authentication.\n  volumes: []\n  # Optionally specify additional labels to use for the controller-manager Pods.\n  podLabels: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: 8443\n  type: ClusterIP"}, {"chart": {"name": "validator-plugin-aws", "repository": "validator-plugin-aws", "version": "v0.1.12"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-aws\n      tag: v0.1.12\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n  replicas: 1\n  serviceAccount:\n    annotations: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: 8443\n  type: ClusterIP\nauth:\n  # Override the service account used by AWS validator (optional, could be used for IAM roles for Service Accounts)\n  # WARNING: the chosen service account must have the same RBAC privileges as seen in templates/manager-rbac.yaml\n  serviceAccountName: \"\""}, {"chart": {"name": "validator-plugin-network", "repository": "validator-plugin-network", "version": "v0.1.2"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: true\n      capabilities:\n        add:\n          - NET_RAW\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-network\n      tag: v0.1.2\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n  replicas: 1\n  serviceAccount:\n    annotations: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: 8443\n  type: ClusterIP"}, {"chart": {"name": "validator-plugin-maas", "repository": "validator-plugin-maas", "version": "v0.0.13"}, "values": "controllerManager:\n  manager:\n    args:\n      - --metrics-bind-address=:8443\n      - --health-probe-bind-address=:8081\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-maas\n      tag: v0.0.13\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n  replicas: 1\n  serviceAccount:\n    annotations: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: 8443\n  type: ClusterIP"}, {"chart": {"name": "validator-plugin-vsphere", "repository": "validator-plugin-vsphere", "version": "v0.1.6"}, "values": "controllerManager:\n  manager:\n    args:\n      - --health-probe-bind-address=:8081\n      - --metrics-bind-address=:8443\n      - --leader-elect\n    containerSecurityContext:\n      allowPrivilegeEscalation: false\n      capabilities:\n        drop:\n          - ALL\n    image:\n      repository: quay.io/validator-labs/validator-plugin-vsphere\n      tag: v0.1.6\n    resources:\n      limits:\n        cpu: 500m\n        memory: 128Mi\n      requests:\n        cpu: 10m\n        memory: 64Mi\n  replicas: 1\n  serviceAccount:\n    annotations: {}\nkubernetesClusterDomain: cluster.local\nmetricsService:\n  ports:\n    - name: https\n      port: 8443\n      protocol: TCP\n      targetPort: 8443\n  type: ClusterIP"}]` |
 
 
 

chart/validator/README.md

@@ -29,7 +29,7 @@ metricsService:
   - name: https
     port: 8443
     protocol: TCP
-    targetPort: https
+    targetPort: 8443
   type: ClusterIP
 
 # Optional environment variable configuration
@@ -196,7 +196,7 @@ plugins:
 - chart:
     name: validator-plugin-azure
     repository: validator-plugin-azure
-    version: v0.0.25
+    version: v0.0.26
   values: |-
     controllerManager:
       manager:
@@ -211,7 +211,7 @@ plugins:
               - ALL
         image:
           repository: quay.io/validator-labs/validator-plugin-azure
-          tag: v0.0.25
+          tag: v0.0.26
         resources:
           limits:
             cpu: 500m
@@ -236,7 +236,7 @@ plugins:
         - name: https
           port: 8443
           protocol: TCP
-          targetPort: https
+          targetPort: 8443
       type: ClusterIP
     auth:
       # Override the service account used by Azure validator (optional, could be used for WorkloadIdentityCredentials on AKS)
@@ -248,7 +248,7 @@ plugins:
 - chart:
     name: validator-plugin-oci
     repository: validator-plugin-oci
-    version: v0.3.4
+    version: v0.3.5
   values: |-
     controllerManager:
       manager:
@@ -263,7 +263,7 @@ plugins:
               - ALL
         image:
           repository: quay.io/validator-labs/validator-plugin-oci
-          tag: v0.3.4
+          tag: v0.3.5
         resources:
           limits:
             cpu: 500m
@@ -280,12 +280,12 @@ plugins:
         - name: https
           port: 8443
           protocol: TCP
-          targetPort: https
+          targetPort: 8443
       type: ClusterIP
 - chart:
     name: validator-plugin-kubescape
     repository: validator-plugin-kubescape
-    version: v0.0.5
+    version: v0.0.6
   values: |-
     controllerManager:
       manager:
@@ -300,7 +300,7 @@ plugins:
               - ALL
         image:
           repository: quay.io/validator-labs/validator-plugin-kubescape
-          tag: v0.0.5
+          tag: v0.0.6
         resources:
           limits:
             cpu: 500m
@@ -325,12 +325,12 @@ plugins:
         - name: https
           port: 8443
           protocol: TCP
-          targetPort: https
+          targetPort: 8443
       type: ClusterIP
 - chart:
     name: validator-plugin-aws
     repository: validator-plugin-aws
-    version: v0.1.11
+    version: v0.1.12
   values: |-
     controllerManager:
       manager:
@@ -345,7 +345,7 @@ plugins:
               - ALL
         image:
           repository: quay.io/validator-labs/validator-plugin-aws
-          tag: v0.1.11
+          tag: v0.1.12
         resources:
           limits:
             cpu: 500m
@@ -362,7 +362,7 @@ plugins:
         - name: https
           port: 8443
           protocol: TCP
-          targetPort: https
+          targetPort: 8443
       type: ClusterIP
     auth:
       # Override the service account used by AWS validator (optional, could be used for IAM roles for Service Accounts)
@@ -371,7 +371,7 @@ plugins:
 - chart:
     name: validator-plugin-network
     repository: validator-plugin-network
-    version: v0.1.1
+    version: v0.1.2
   values: |-
     controllerManager:
       manager:
@@ -388,7 +388,7 @@ plugins:
               - ALL
         image:
           repository: quay.io/validator-labs/validator-plugin-network
-          tag: v0.1.1
+          tag: v0.1.2
         resources:
           limits:
             cpu: 500m
@@ -405,7 +405,7 @@ plugins:
         - name: https
           port: 8443
           protocol: TCP
-          targetPort: https
+          targetPort: 8443
       type: ClusterIP
 - chart:
     name: validator-plugin-maas
@@ -447,7 +447,7 @@ plugins:
 - chart:
     name: validator-plugin-vsphere
     repository: validator-plugin-vsphere
-    version: v0.1.5
+    version: v0.1.6
   values: |-
     controllerManager:
       manager:
@@ -462,7 +462,7 @@ plugins:
               - ALL
         image:
           repository: quay.io/validator-labs/validator-plugin-vsphere
-          tag: v0.1.5
+          tag: v0.1.6
         resources:
           limits:
             cpu: 500m
@@ -479,5 +479,5 @@ plugins:
         - name: https
           port: 8443
           protocol: TCP
-          targetPort: https
+          targetPort: 8443
       type: ClusterIP

chart/validator/values.yaml

@@ -29,7 +29,7 @@ metricsService:
   - name: https
     port: 8443
     protocol: TCP
-    targetPort: https
+    targetPort: 8443
   type: ClusterIP
 
 # Optional environment variable configuration

hack/chart/values-base.yaml

@@ -5,13 +5,13 @@ metadata:
 spec:
   images:
     - name: quay.io/validator-labs/validator:v0.1.15 # x-release-please-version
-    - name: quay.io/validator-labs/validator-plugin-aws:v0.1.11
-    - name: quay.io/validator-labs/validator-plugin-azure:v0.0.25
-    - name: quay.io/validator-labs/validator-plugin-kubescape:v0.0.5
+    - name: quay.io/validator-labs/validator-plugin-aws:v0.1.12
+    - name: quay.io/validator-labs/validator-plugin-azure:v0.0.26
+    - name: quay.io/validator-labs/validator-plugin-kubescape:v0.0.6
     - name: quay.io/validator-labs/validator-plugin-maas:v0.0.13
-    - name: quay.io/validator-labs/validator-plugin-network:v0.1.1
-    - name: quay.io/validator-labs/validator-plugin-oci:v0.3.4
-    - name: quay.io/validator-labs/validator-plugin-vsphere:v0.1.5
+    - name: quay.io/validator-labs/validator-plugin-network:v0.1.2
+    - name: quay.io/validator-labs/validator-plugin-oci:v0.3.5
+    - name: quay.io/validator-labs/validator-plugin-vsphere:v0.1.6
     - name: quay.io/validator-labs/validator-certs-init:1.0.0
     - name: gcr.io/spectro-images-public/release/spectro-cleanup:1.2.0
     - name: kindest/node:v1.30.2
@@ -27,25 +27,25 @@ spec:
       version: 0.1.15 # x-release-please-version
     - name: validator-plugin-aws
       repoURL: https://validator-labs.github.io/validator-plugin-aws
-      version: 0.1.11
+      version: 0.1.12
     - name: validator-plugin-azure
       repoURL: https://validator-labs.github.io/validator-plugin-azure
-      version: 0.0.25
+      version: 0.0.26
     - name: validator-plugin-kubescape
       repoURL: https://validator-labs.github.io/validator-plugin-kubescape
-      version: 0.0.5
+      version: 0.0.6
     - name: validator-plugin-maas
       repoURL: https://validator-labs.github.io/validator-plugin-maas
       version: 0.0.13
     - name: validator-plugin-network
       repoURL: https://validator-labs.github.io/validator-plugin-network
-      version: 0.1.1
+      version: 0.1.2
     - name: validator-plugin-oci
       repoURL: https://validator-labs.github.io/validator-plugin-oci
-      version: 0.3.4
+      version: 0.3.5
     - name: validator-plugin-vsphere
       repoURL: https://validator-labs.github.io/validator-plugin-vsphere
-      version: 0.1.5
+      version: 0.1.6
 ---
 apiVersion: content.hauler.cattle.io/v1alpha1
 kind: Files

hauler-manifest.yaml

@@ -47,5 +47,5 @@ spec:
         - name: https
           port: 8443
           protocol: TCP
-          targetPort: https
+          targetPort: 8443
         type: ClusterIP