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.

Sign up for GitHub

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

Do not mount token private key to proxy pod containers #107

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Do not mount token private key to proxy pod containers #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 7 deletions ...src/test/java/com/datastax/oss/kaap/migrationtool/PulsarClusterResourceGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void testNoFunctions() throws Exception {
final DiffCollectorOutputWriter diff = generate(client, tmpDir);
final File outputDir = new File(tmpDir.toFile(), CONTEXT);
final PulsarCluster pulsar = getPulsarClusterFromOutputdir(outputDir);
assertDiff(diff, 122);
assertDiff(diff, 123);
Assert.assertEquals(pulsar.getSpec().getFunctionsWorker().getReplicas(), 0);
}

Expand All @@ -91,7 +91,7 @@ public void testNoBastion() throws Exception {
final DiffCollectorOutputWriter diff = generate(client, tmpDir);
final File outputDir = new File(tmpDir.toFile(), CONTEXT);
final PulsarCluster pulsar = getPulsarClusterFromOutputdir(outputDir);
assertDiff(diff, 151);
assertDiff(diff, 152);
Assert.assertEquals(pulsar.getSpec().getBastion().getReplicas(), 0);
}

Expand Down Expand Up @@ -707,8 +707,6 @@ private void assertValue(File tmpDir) {
value: pulsar://pulsar-cluster-broker:6650
- name: PulsarPublicKey
value: /pulsar/token-public-key/pulsar-public.key
- name: PulsarPrivateKey
value: /pulsar/token-private-key/pulsar-private.key
- name: CertFile
value: /pulsar/certs/tls.crt
- name: KeyFile
Expand Down Expand Up @@ -750,9 +748,6 @@ private void assertValue(File tmpDir) {
- mountPath: /pulsar/certs
name: certs
readOnly: true
- mountPath: /pulsar/token-private-key
name: token-private-key
readOnly: true
- mountPath: /pulsar/token-public-key
name: token-public-key
readOnly: true
Expand Down
2 changes: 0 additions & 2 deletions ...ol/src/test/resources/pulsar-helm-chart/base-release/deployment-pulsar-cluster-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,6 @@ spec:
value: pulsar://pulsar-cluster-broker:6650
- name: PulsarPublicKey
value: /pulsar/token-public-key/pulsar-public.key
- name: PulsarPrivateKey
value: /pulsar/token-private-key/pulsar-private.key
- name: CertFile
value: /pulsar/certs/tls.crt
- name: KeyFile
Expand Down
1 change: 0 additions & 1 deletion operator/src/main/java/com/datastax/oss/kaap/controllers/proxy/ProxyResourcesFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@ public void patchDeployment() {
}
if (isAuthTokenEnabled()) {
addSecretTokenVolume(volumeMounts, volumes, "public-key");
addSecretTokenVolume(volumeMounts, volumes, "private-key");
addSecretTokenVolume(volumeMounts, volumes, "proxy");
addSecretTokenVolume(volumeMounts, volumes, "websocket");
addSecretTokenVolume(volumeMounts, volumes, "superuser");
Expand Down