Skip to content

Commit 7fa602c

Browse files
Ryan FairclothAddon Factory template
andauthored
fix(celery): fix issue with url generation causing install failure (#69)
* fix(celery): do not use auth for private queues * fix * update * Update worker-deployment.yaml * fix * Update celery-queue.yaml * fix * Update install_full.bash Co-authored-by: Addon Factory template <[email protected]>
1 parent 02caa49 commit 7fa602c

File tree

6 files changed

+6
-37
lines changed

6 files changed

+6
-37
lines changed

deploy/.DS_Store

8 KB
Binary file not shown.

deploy/celery-queue.yaml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
apiVersion: v1
2-
kind: Secret
3-
metadata:
4-
name: celery-rabbitmq
5-
annotations:
6-
secret-generator.v1.mittwald.de/autogenerate: rabbitmq-password
7-
secret-generator.v1.mittwald.de/encoding: base64url
81
---
92
apiVersion: helm.fluxcd.io/v1
103
kind: HelmRelease
@@ -83,8 +76,8 @@ spec:
8376
## RabbitMQ application password
8477
## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables
8578
##
86-
#password: password
87-
existingPasswordSecret: celery-rabbitmq
79+
password: sc4snmp
80+
#existingPasswordSecret: celery-rabbitmq
8881

8982
## Erlang cookie to determine whether different nodes are allowed to communicate with each other
9083
## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables
@@ -151,7 +144,7 @@ spec:
151144
## Extra plugins to enable
152145
## Use this instead of `plugins` to add new plugins
153146
##
154-
extraPlugins: "rabbitmq_auth_backend_ldap"
147+
#extraPlugins: "rabbitmq_auth_backend_ldap"
155148

156149
## Clustering settings
157150
##
@@ -235,7 +228,7 @@ spec:
235228
# queue master locator
236229
queue_master_locator = min-masters
237230
# enable guest user
238-
loopback_users.guest = false
231+
loopback_users.guest = true
239232
{{ tpl .Values.extraConfiguration . }}
240233
{{- if .Values.auth.tls.enabled }}
241234
ssl_options.verify = {{ .Values.auth.tls.sslOptionsVerify }}

deploy/install_full.bash

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ fi #end sim or both
313313
#Create the namespace
314314
kapply sc4snmp deploy/sc4snmp/namespace.yaml
315315

316-
kapply kube-system deploy/sc4snmp/secret-manager.yaml
317316
kapply sc4snmp deploy/celery-queue.yaml
318317
kapply sc4snmp deploy/mongo-cache.yaml
319318

deploy/sc4snmp/internal/scheduler-deployment.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,8 @@ spec:
2929
value: sc4snmp-cache-mongodb
3030
- name: MONGO_SERVICE_SERVICE_PORT
3131
value: "27017"
32-
- name: RABBIT_USER
33-
value: sc4snmp
34-
- name: RABBIT_PASSWORD
35-
valueFrom:
36-
secretKeyRef:
37-
name: celery-rabbitmq
38-
key: rabbitmq-password
3932
- name: CELERY_BROKER_URL
40-
value: amqp://$(RABBIT_USER):$(RABBIT_PASSWORD)@sc4snmp-celery-rabbitmq:5672/
33+
value: amqp://sc4snmp:sc4snmp@sc4snmp-celery-rabbitmq:5672/
4134
- name: POLLER_EXECUTION_MODE
4235
value: scheduler
4336
volumeMounts:

deploy/sc4snmp/internal/worker-deployment.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,8 @@ spec:
2020
imagePullPolicy: Always
2121
args: ["--log=WARN", "--config=/work/config/config.yaml"]
2222
env:
23-
- name: RABBIT_USER
24-
value: sc4snmp
25-
- name: RABBIT_PASSWORD
26-
valueFrom:
27-
secretKeyRef:
28-
name: celery-rabbitmq
29-
key: rabbitmq-password
3023
- name: CELERY_BROKER_URL
31-
value: amqp://$(RABBIT_USER):$(RABBIT_PASSWORD)@sc4snmp-celery-rabbitmq:5672/
24+
value: amqp://sc4snmp:sc4snmp@sc4snmp-celery-rabbitmq:5672/
3225
- name: MIBS_SERVER_URL
3326
value: http://$(MIB_SERVER_SERVICE_SERVICE_HOST):$(MIB_SERVER_SERVICE_SERVICE_PORT)
3427
- name: MIBS_FILES_URL

deploy/sc4snmp/secret-manager.yaml

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)