Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 13:55:21 +02:00
Code Issues Releases Activity

fix(kubernetes): deprecate old configurations api EE-5571 (#10837)

Browse source 
* fix(kubernetes): deprecate old configurations api EE-5571

* fix doc variable type
This commit is contained in:
Dakota Walsh 2023-12-15 09:04:08 +13:00 • committed by GitHub
parent 0b9407f0a6
commit 0ddf84638f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

49
app/react/kubernetes/configs/queries.ts
View file

@ -1,49 +0,0 @@
import { useQuery } from 'react-query';
import { EnvironmentId } from '@/react/portainer/environments/types';
import { error as notifyError } from '@/portainer/services/notifications';
import { withError } from '@/react-tools/react-query';
import { getConfigurations, getConfigMapsForCluster } from './service';
// returns a usequery hook for the formatted list of configmaps and secrets
export function useConfigurations(
environmentId: EnvironmentId,
namespace?: string
) {
return useQuery(
[
'environments',
environmentId,
'kubernetes',
'namespaces',
namespace,
'configurations',
],
() => (namespace ? getConfigurations(environmentId, namespace) : []),
{
onError: (err) => {
notifyError(
'Failure',
err as Error,
`Unable to get configurations for namespace ${namespace}`
);
},
enabled: !!namespace,
}
);
}
export function useConfigurationsForCluster(
environemtId: EnvironmentId,
namespaces?: string[]
) {
return useQuery(
['environments', environemtId, 'kubernetes', 'configurations'],
() => namespaces && getConfigMapsForCluster(environemtId, namespaces),
{
...withError('Unable to retrieve configurations for cluster'),
enabled: !!namespaces,
}
);
}

20
app/react/kubernetes/ingresses/CreateIngressView/CreateIngressView.tsx
View file

@ -4,7 +4,7 @@ import { v4 as uuidv4 } from 'uuid';
import { debounce } from 'lodash';
import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
import { useConfigurations } from '@/react/kubernetes/configs/queries';
import { useSecrets } from '@/react/kubernetes/configs/secret.service';
import { useNamespaceServices } from '@/react/kubernetes/networks/services/queries';
import { notifyError, notifySuccess } from '@/portainer/services/notifications';
import { useAuthorizations } from '@/react/hooks/useUser';
@ -68,7 +68,7 @@ export function CreateIngressView() {
useNamespacesQuery(environmentId);
const { data: allServices } = useNamespaceServices(environmentId, namespace);
const configResults = useConfigurations(environmentId, namespace);
const secretsResults = useSecrets(environmentId, namespace);
const ingressesResults = useIngresses(
environmentId,
namespaces ? Object.keys(namespaces || {}) : []
@ -266,20 +266,20 @@ export function CreateIngressView() {
ingressRule.IngressClassName,
]);
const matchedConfigs = configResults?.data?.filter(
const secrets = secretsResults?.data?.filter(
(config) =>
config.SecretType === 'kubernetes.io/tls' &&
config.Namespace === namespace
config.type === 'kubernetes.io/tls' &&
config.metadata?.namespace === namespace
);
const tlsOptions: Option<string>[] = useMemo(
() => [
{ label: 'No TLS', value: '' },
...(matchedConfigs?.map((config) => ({
label: config.Name,
value: config.Name,
...(secrets?.map((config) => ({
label: config.metadata?.name as string,
value: config.metadata?.name as string,
})) || []),
],
[matchedConfigs]
[secrets]
);
useEffect(() => {
@ -811,7 +811,7 @@ export function CreateIngressView() {
}
function reloadTLSCerts() {
configResults.refetch();
secretsResults.refetch();
}
function handleCreateIngressRules() {