Skip to content

Commit

Permalink
Merge pull request #11430 from torchiaf/revert-11419
Browse files Browse the repository at this point in the history
Revert "Encode CA bundle key in base64 format"
  • Loading branch information
torchiaf committed Jul 12, 2024
2 parents 22488eb + 39da105 commit 6d26ce9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 69 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthS
import CreateEditView from '@shell/mixins/create-edit-view';
import SecretSelector from '@shell/components/form/SecretSelector';
import { SECRET_TYPES as TYPES } from '@shell/config/secret';
import { base64Decode, base64Encode } from '@shell/utils/crypto';
export default {
components: {
Expand Down Expand Up @@ -56,7 +55,7 @@ export default {
if (configMap[hostname]) {
configMap[hostname].insecureSkipVerify = configMap[hostname].insecureSkipVerify ?? defaultAddValue.insecureSkipVerify;
configMap[hostname].authConfigSecretName = configMap[hostname].authConfigSecretName ?? defaultAddValue.authConfigSecretName;
configMap[hostname].caBundle = base64Decode(configMap[hostname].caBundle ?? defaultAddValue.caBundle);
configMap[hostname].caBundle = configMap[hostname].caBundle ?? defaultAddValue.caBundle;
configMap[hostname].tlsSecretName = configMap[hostname].tlsSecretName ?? defaultAddValue.tlsSecretName;
}
entries.push({
Expand Down Expand Up @@ -95,11 +94,7 @@ export default {
continue;
}
configs[h] = {
...entry,
caBundle: base64Encode(entry.caBundle)
};
configs[h] = { ...entry };
delete configs[h].hostname;
}
Expand Down Expand Up @@ -182,7 +177,6 @@ export default {
<LabeledInput
v-model="row.value.caBundle"
:data-testid="`registry-caBundle-${i}`"
class="mt-20"
type="multiline"
label="CA Cert Bundle"
Expand Down

This file was deleted.

0 comments on commit 6d26ce9

Please sign in to comment.