Merge pull request lsst-sqre#3946 from lsst-sqre/tickets/DM-47672

DM-47672: Bump Unfurlbot to version 0.3.2

applications/unfurlbot/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "0.3.1"
+appVersion: "0.3.2"
 description: Squarebot backend that unfurls Jira issues.
 name: unfurlbot
 sources:

applications/unfurlbot/README.md

@@ -11,10 +11,6 @@ Squarebot backend that unfurls Jira issues.
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` | Affinity rules for the unfurlbot deployment pod |
-| autoscaling.enabled | bool | `false` | Enable autoscaling of unfurlbot deployment |
-| autoscaling.maxReplicas | int | `100` | Maximum number of unfurlbot deployment pods |
-| autoscaling.minReplicas | int | `1` | Minimum number of unfurlbot deployment pods |
-| autoscaling.targetCPUUtilizationPercentage | int | `80` | Target CPU utilization of unfurlbot deployment pods |
 | config.jiraProjects | string | See `values.yaml` | Names of Jira projects to unfurl (comma-separated) |
 | config.jiraUrl | string | `"https://rubinobs.atlassian.net/"` | Jira base URL |
 | config.logLevel | string | `"INFO"` | Logging level: "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL" |
@@ -29,7 +25,7 @@ Squarebot backend that unfurls Jira issues.
 | global.vaultSecretsPath | string | Set by Argo CD | Base path for Vault secrets |
 | image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the unfurlbot image |
 | image.repository | string | `"ghcr.io/lsst-sqre/unfurlbot"` | Image to use in the unfurlbot deployment |
-| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | The appVersion of the chart | Image tag to use |
 | ingress.annotations | object | `{}` | Additional annotations for the ingress rule |
 | nodeSelector | object | `{}` | Node selection rules for the unfurlbot deployment pod |
 | podAnnotations | object | `{}` | Annotations for the unfurlbot deployment pod |

applications/unfurlbot/secrets.yaml

@@ -20,7 +20,8 @@ UNFURLBOT_SLACK_APP_ID:
     key: SQUAREBOT_SLACK_APP_ID
 UNFURLBOT_SLACK_TOKEN:
   description: >-
-    The Slack bot user oauth token for the Slack App shared by all Squarebot services.
+    The Slack bot user OAuth token for the Slack App shared by all Squarebot
+    services.
   copy:
     application: squarebot
     key: SQUAREBOT_SLACK_TOKEN

applications/unfurlbot/templates/deployment.yaml

@@ -7,9 +7,7 @@ metadata:
     app.kubernetes.io/component: "server"
     app.kubernetes.io/part-of: "unfurlbot"
 spec:
-  {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
-  {{- end }}
   selector:
     matchLabels:
       {{- include "unfurlbot.selectorLabels" . | nindent 6 }}

applications/unfurlbot/templates/kafkaaccess.yaml

@@ -1,14 +1,16 @@
 apiVersion: access.strimzi.io/v1alpha1
 kind: KafkaAccess
 metadata:
-  name: unfurlbot-kafka
+  name: "unfurlbot-kafka"
+  labels:
+    {{- include "unfurlbot.labels" . | nindent 4 }}
 spec:
   kafka:
-    name: sasquatch
-    namespace: sasquatch
-    listener: tls
+    name: "sasquatch"
+    namespace: "sasquatch"
+    listener: "tls"
   user:
-    kind: KafkaUser
-    apiGroup: kafka.strimzi.io
-    name: unfurlbot
-    namespace: sasquatch
+    kind: "KafkaUser"
+    apiGroup: "kafka.strimzi.io"
+    name: "unfurlbot"
+    namespace: "sasquatch"

applications/unfurlbot/templates/networkpolicy.yaml

@@ -2,6 +2,8 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   name: "unfurlbot"
+  labels:
+    {{- include "unfurlbot.labels" . | nindent 4 }}
 spec:
   podSelector:
     matchLabels:

applications/unfurlbot/values.yaml

@@ -12,7 +12,8 @@ image:
   # -- Pull policy for the unfurlbot image
   pullPolicy: "IfNotPresent"
 
-  # -- Overrides the image tag whose default is the chart appVersion.
+  # -- Image tag to use
+  # @default -- The appVersion of the chart
   tag: ""
 
 config:
@@ -103,7 +104,6 @@ ingress:
   annotations: {}
 
 redis:
-
   # -- Resource requests and limits for the redis pod
   # @default -- see `values.yaml`
   resources:
@@ -114,19 +114,11 @@ redis:
       cpu: "2m"
       memory: "3Mi"
 
-autoscaling:
-  # -- Enable autoscaling of unfurlbot deployment
-  enabled: false
-
-  # -- Minimum number of unfurlbot deployment pods
-  minReplicas: 1
-
-  # -- Maximum number of unfurlbot deployment pods
-  maxReplicas: 100
+# -- Affinity rules for the unfurlbot deployment pod
+affinity: {}
 
-  # -- Target CPU utilization of unfurlbot deployment pods
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
+# -- Node selection rules for the unfurlbot deployment pod
+nodeSelector: {}
 
 # -- Annotations for the unfurlbot deployment pod
 podAnnotations: {}
@@ -141,15 +133,9 @@ resources:
     cpu: "9m"
     memory: "60Mi"
 
-# -- Node selection rules for the unfurlbot deployment pod
-nodeSelector: {}
-
 # -- Tolerations for the unfurlbot deployment pod
 tolerations: []
 
-# -- Affinity rules for the unfurlbot deployment pod
-affinity: {}
-
 # The following will be set by parameters injected by Argo CD and should not
 # be set in the individual environment values files.
 global: