Merge branch 'main' into APL-809

Author: dennisvankekem

src/components/forms/TextArea.tsx

@@ -25,7 +25,7 @@ const useStyles = makeStyles<{ disabled?: boolean; error?: boolean }>()((theme:
       marginBottom: theme.spacing(2),
     },
     textarea: {
-      backgroundColor: theme.palette.background.default,
+      backgroundColor: theme.palette.cm.textBox,
       color: theme.palette.cl.text.title,
       padding: theme.spacing(1),
       border: `1px solid ${theme.palette.cm.inputBorder}`,

src/pages/secrets/create-edit/SecretCreateEditPage.tsx

@@ -239,7 +239,7 @@ export default function SecretCreateEditPage({
         {sealedSecretName && isImmutable && (
           <InformationBanner
             sx={{ my: '1rem' }}
-            message='This secret is marked as immutable and therefore values cannot be changed, only deleted.'
+            message='This secret is marked as immutable and therefore the Secret data cannot be modified, only deleted.'
           />
         )}
         <FormProvider {...methods}>
@@ -263,7 +263,7 @@ export default function SecretCreateEditPage({
                 error={!!errors.type}
                 helperText={
                   errors.type?.message?.toString() ||
-                  'Kubernetes offers different types of secrets, please see: https://kubernetes.io/docs/concepts/configuration/secret/ for which secret type fits your use case best.'
+                  'Select the Secret type for the appropriate handling of the Secret data.'
                 }
                 {...register('type')}
                 value={watch('type') || 'kubernetes.io/opaque'}
@@ -280,8 +280,8 @@ export default function SecretCreateEditPage({
                   sx={{ mt: '2rem' }}
                   message={
                     !isEqual(formData.encryptedData, watch('encryptedData'))
-                      ? 'You are about to override secret values, your changes will go into effect once you click the "Save Changes" button.'
-                      : 'You can add new values to override existing values, but be aware that applications using this token might need to be adapted.'
+                      ? 'You are about to change secret data. Changes will become active after clicking the "Save Changes" button.'
+                      : 'You can add new or override existing secret data.'
                   }
                 />
               )}
@@ -299,15 +299,15 @@ export default function SecretCreateEditPage({
                 name='immutable'
                 control={control}
                 label='Immutable'
-                explainertext='If set to true, ensures that data stored in the Secret cannot be updated (only object metadata can be modified).'
+                explainertext='If enabled, the Secret data cannot be updated after creation.'
                 disabled={sealedSecretName && isImmutable}
               />
             </Section>
             <AdvancedSettings>
               <Section title='Metadata'>
                 <KeyValue
                   title='Labels'
-                  subTitle='Labels let you categorize and select objects.  (e.g. env = production, tier = backend) '
+                  subTitle='Add labels to specify identifying attributes of the Secret.'
                   name='metadata.labels'
                   keyLabel='key'
                   valueLabel='value'
@@ -320,7 +320,7 @@ export default function SecretCreateEditPage({
                 <Divider />
                 <KeyValue
                   title='Annotations'
-                  subTitle='Not used for selection like labels, but rather to describe (e.g. createdBy, expiryTimestamp)'
+                  subTitle='Add annotations to store custom metadata about the Secret.'
                   name='metadata.annotations'
                   keyLabel='key'
                   valueLabel='value'
@@ -333,9 +333,7 @@ export default function SecretCreateEditPage({
                 <Divider />
                 <KeyValue
                   title='Finalizers'
-                  subTitle='A list of “blockers” that must be removed before Kubernetes can remove the Secret. This is very important, for example if you remove a secret that holds information for a TLS certificate
-you first want to revoke said certificate before removing the secret, A finalizer like "acme.myorg.com/certificate-cleanup" will make sure  to first revoke the certificate before removing the
-secret'
+                  subTitle='Add finalizers to specify conditions that need to be met before a Secret can be marked for deletion.'
                   name='metadata.finalizers'
                   keyLabel='key'
                   valueLabel='value'

src/pages/secrets/create-edit/SecretTypeFields.tsx

@@ -22,15 +22,15 @@ export function SecretTypeFields({
   const typePath = namePrefix ? `${namePrefix}.type` : 'type'
   const dataPath = namePrefix ? `${namePrefix}.encryptedData` : 'encryptedData'
   const selectedType = useWatch({ control, name: typePath }) as typeof secretTypes[number]
-  const title = 'Encrypted Data'
+  const title = 'Secret Data'
   const disabled = immutable && { keyDisabled: true, valueDisabled: true, disabled: true }
 
   switch (selectedType) {
     case 'kubernetes.io/opaque':
       return (
         <KeyValue
           title={title}
-          subTitle='A Kubernetes Opaque Secret is simply the "generic" secret type—perfect any time you need to stash arbitrary key-value data that doesn’t fit one of the built‐in types'
+          subTitle='Add arbitrary key-value data.'
           name={dataPath}
           keyLabel='Key'
           valueLabel='Value'
@@ -45,13 +45,64 @@ export function SecretTypeFields({
         />
       )
     case 'kubernetes.io/dockercfg':
+      return (
+        <KeyValue
+          title={title}
+          subTitle='Add contents from a serialized ~/.dockercfg file.'
+          name={dataPath}
+          keyDisabled
+          keyLabel='Key'
+          valueLabel='Value'
+          showLabel={false}
+          compressed
+          error={error}
+          helperText={helperText}
+          isEncrypted={isEncrypted}
+          isTextArea
+          {...disabled}
+        />
+      )
     case 'kubernetes.io/dockerconfigjson':
+      return (
+        <KeyValue
+          title={title}
+          subTitle='Add contents from a serialized ~/.docker/config.json file.'
+          name={dataPath}
+          keyDisabled
+          keyLabel='Key'
+          valueLabel='Value'
+          showLabel={false}
+          compressed
+          error={error}
+          helperText={helperText}
+          isEncrypted={isEncrypted}
+          isTextArea
+          {...disabled}
+        />
+      )
     case 'kubernetes.io/ssh-auth':
+      return (
+        <KeyValue
+          title={title}
+          subTitle='Add credentials for SSH authentication.'
+          name={dataPath}
+          keyDisabled
+          keyLabel='Key'
+          valueLabel='Value'
+          showLabel={false}
+          compressed
+          error={error}
+          helperText={helperText}
+          isEncrypted={isEncrypted}
+          isTextArea
+          {...disabled}
+        />
+      )
     case 'kubernetes.io/tls':
       return (
         <KeyValue
           title={title}
-          subTitle={`Enter key-value pairs for the "${selectedType}" secret type`}
+          subTitle='Add the data for a TLS client or server.'
           name={dataPath}
           keyDisabled
           keyLabel='Key'
@@ -69,7 +120,7 @@ export function SecretTypeFields({
       return (
         <KeyValue
           title={title}
-          subTitle='Basic-auth Secret exists out of a username and password'
+          subTitle='Add credentials (username and password) for basic authentication.'
           keyDisabled
           name={dataPath}
           keyLabel='Key'