Merge pull request #3608 from lsst-sqre/tickets/DM-45676

DM-45676: Deploy Ook 0.10.0
lsst-sqre · Aug 14, 2024 · eb22e42 · eb22e42
2 parents 7e672c0 + 3620a91
commit eb22e42
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 25 deletions.
diff --git a/applications/ook/Chart.yaml b/applications/ook/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: ook
 version: 1.0.0
-appVersion: "0.9.1"
+appVersion: "0.10.0"
 description: >
   Ook is the librarian service for Rubin Observatory. Ook indexes
   documentation content into the Algolia search engine that powers the Rubin

diff --git a/applications/ook/README.md b/applications/ook/README.md
@@ -24,9 +24,6 @@ Ook is the librarian service for Rubin Observatory. Ook indexes documentation co
 | audit.ttlSecondsAfterFinished | int | `86400` | Time (second) to keep a finished job before cleaning up |
 | config.algolia.documents_index | string | `"documents_dev"` | Name of the Algolia index for documents |
 | config.logLevel | string | `"INFO"` | Logging level: "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL" |
-| config.registryUrl | string | `"http://sasquatch-schema-registry.sasquatch:8081"` | Cluster URL for the Confluent Schema Registry |
-| config.subjectCompatibility | string | `"FORWARD"` | Schema subject compatibility. |
-| config.subjectSuffix | string | `""` | Schema subject suffix. Should be empty for production but can be set to a value to create unique subjects in the Confluent Schema Registry for testing. |
 | config.topics.ingest | string | `"lsst.square-events.ook.ingest"` | Kafka topic name for ingest events |
 | fullnameOverride | string | `""` | Override the full name for resources (includes the release name) |
 | global.baseUrl | string | Set by Argo CD | Base URL for the environment |

diff --git a/applications/ook/templates/cronjob-audit.yaml b/applications/ook/templates/cronjob-audit.yaml
@@ -64,11 +64,11 @@ spec:
                     secretKeyRef:
                       name: {{ template "ook.fullname" . }}-kafka
                       key: "bootstrapServers"
-                - name: "KAFKA_SSL_CLUSTER_CAFILE"
+                - name: "KAFKA_CLUSTER_CA_PATH"
                   value: "/etc/kafkacluster/ca.crt"
-                - name: "KAFKA_SSL_CLIENT_CERTFILE"
+                - name: "KAFKA_CLIENT_CERT_PATH"
                   value: "/etc/kafkauser/user.crt"
-                - name: "KAFKA_SSL_CLIENT_KEYFILE"
+                - name: "KAFKA_CLIENT_KEY_PATH"
                   value: "/etc/kafkauser/user.key"
                 # From Vault secrets
                 - name: "ALGOLIA_APP_ID"

diff --git a/applications/ook/templates/cronjob-ingest-updated.yaml b/applications/ook/templates/cronjob-ingest-updated.yaml
@@ -63,11 +63,11 @@ spec:
                     secretKeyRef:
                       name: {{ template "ook.fullname" . }}-kafka
                       key: "bootstrapServers"
-                - name: "KAFKA_SSL_CLUSTER_CAFILE"
+                - name: "KAFKA_CLUSTER_CA_PATH"
                   value: "/etc/kafkacluster/ca.crt"
-                - name: "KAFKA_SSL_CLIENT_CERTFILE"
+                - name: "KAFKA_CLIENT_CERT_PATH"
                   value: "/etc/kafkauser/user.crt"
-                - name: "KAFKA_SSL_CLIENT_KEYFILE"
+                - name: "KAFKA_CLIENT_KEY_PATH"
                   value: "/etc/kafkauser/user.key"
                 # From Vault secrets
                 - name: "ALGOLIA_APP_ID"

diff --git a/applications/ook/templates/deployment.yaml b/applications/ook/templates/deployment.yaml
@@ -65,11 +65,11 @@ spec:
                 secretKeyRef:
                   name: {{ template "ook.fullname" . }}-kafka
                   key: "bootstrapServers"
-            - name: "KAFKA_SSL_CLUSTER_CAFILE"
+            - name: "KAFKA_CLUSTER_CA_PATH"
               value: "/etc/kafkacluster/ca.crt"
-            - name: "KAFKA_SSL_CLIENT_CERTFILE"
+            - name: "KAFKA_CLIENT_CERT_PATH"
               value: "/etc/kafkauser/user.crt"
-            - name: "KAFKA_SSL_CLIENT_KEYFILE"
+            - name: "KAFKA_CLIENT_KEY_PATH"
               value: "/etc/kafkauser/user.key"
             # From Vault secrets
             - name: "ALGOLIA_APP_ID"

diff --git a/applications/ook/values.yaml b/applications/ook/values.yaml
@@ -64,7 +64,6 @@ ingress:
   # -- Path prefix where Squarebot is hosted
   path: "/ook"
 
-
 # -- Resource requests and limits for Ook pod
 # @default -- See `values.yaml`
 resources:
@@ -85,17 +84,6 @@ config:
   # -- Logging level: "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"
   logLevel: "INFO"
 
-  # -- Cluster URL for the Confluent Schema Registry
-  registryUrl: "http://sasquatch-schema-registry.sasquatch:8081"
-
-  # -- Schema subject suffix. Should be empty for production but can be set
-  # to a value to create unique subjects in the Confluent Schema Registry
-  # for testing.
-  subjectSuffix: ""
-
-  # -- Schema subject compatibility.
-  subjectCompatibility: "FORWARD"
-
   topics:
     # -- Kafka topic name for ingest events
     ingest: "lsst.square-events.ook.ingest"