Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ROX-20479: fix fleet-manager-active cert #1572

Merged
merged 2 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -558,13 +558,6 @@
"is_verified": false,
"line_number": 702,
"is_secret": false
},
{
"type": "Secret Keyword",
"filename": "templates/service-template.yml",
"hashed_secret": "9d51dabe59aa776bef2909d3689374ebb93ab2be",
"is_verified": false,
"line_number": 744
}
],
"test/support/certs.json": [
Expand Down Expand Up @@ -593,5 +586,5 @@
}
]
},
"generated_at": "2024-01-11T17:41:29Z"
"generated_at": "2024-01-16T06:04:44Z"
}
11 changes: 10 additions & 1 deletion templates/service-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ objects:
annotations:
qontract.recycle: "true"
data:
main.yaml: |
main.yaml: | # pragma: allowlist secret
# The administration endpoint uses a Unix socket instead of TCP in order
# to avoid exposing it outside of the pod. Requests for metrics and
# probes will go via an HTTP listener that only accepts requests for the
Expand Down Expand Up @@ -867,6 +867,10 @@ objects:
filename: /secrets/tls/tls.crt
private_key:
filename: /secrets/tls/tls.key
- certificate_chain:
filename: /secrets/active-tls/tls.crt
private_key:
filename: /secrets/active-tls/tls.key
filters:
- name: envoy.filters.network.http_connection_manager
typed_config:
Expand Down Expand Up @@ -1073,6 +1077,9 @@ objects:
- name: envoy-tls
secret:
secretName: fleet-manager-envoy-tls # pragma: allowlist secret
- name: active-tls
secret:
secretName: fleet-manager-active-tls # pragma: allowlist secret
- name: envoy-unix-sockets
emptyDir:
medium: Memory
Expand Down Expand Up @@ -1335,6 +1342,8 @@ objects:
volumeMounts:
- name: envoy-tls
mountPath: /secrets/tls
- name: active-tls
mountPath: /secrets/active-tls
- name: envoy-config
mountPath: /configs/envoy
- name: envoy-unix-sockets
Expand Down
Loading