Skip to content
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
2 changes: 1 addition & 1 deletion src/languageservice/services/crdUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function autoDetectKubernetesSchemaFromDocument(
})
.filter((ref) => ref)
.map((ref) => ref.replace('_definitions.json#/definitions/', '').toLowerCase());
const groupWithoutK8sIO = group.replace('.k8s.io', '');
const groupWithoutK8sIO = group.replace('.k8s.io', '').replace('rbac.authorization', 'rbac');
const k8sTypeName = `io.k8s.api.${groupWithoutK8sIO.toLowerCase()}.${version.toLowerCase()}.${kind.toLowerCase()}`;

if (kubernetesBuildIns.includes(k8sTypeName)) {
Expand Down
31 changes: 31 additions & 0 deletions test/yamlSchemaService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -456,5 +456,36 @@ spec:
expect(requestServiceMock).calledWithExactly('file:///_definitions.json');
expect(requestServiceMock).calledTwice;
});

it('should not get schema from crd catalog for RBAC-related resources', async () => {
const documentContent = 'apiVersion: rbac.authorization.k8s.io/v1\nkind: RoleBinding';
const content = `${documentContent}`;
const yamlDock = parse(content);

const settings = new SettingsState();
settings.schemaAssociations = {
kubernetes: ['*.yaml'],
};
settings.kubernetesCRDStoreEnabled = true;
requestServiceMock = sandbox.fake.resolves(
`
{
"oneOf": [
{
"$ref": "_definitions.json#/definitions/io.k8s.api.rbac.v1.RoleBinding"
}
]
}
`
);
const service = new SchemaService.YAMLSchemaService(requestServiceMock, undefined, undefined, settings);
service.registerExternalSchema(KUBERNETES_SCHEMA_URL, ['*.yaml']);
const resolvedSchema = await service.getSchemaForResource('test.yaml', yamlDock.documents[0]);
expect(resolvedSchema.schema.url).eqls(KUBERNETES_SCHEMA_URL);

expect(requestServiceMock).calledWithExactly(KUBERNETES_SCHEMA_URL);
expect(requestServiceMock).calledWithExactly('file:///_definitions.json');
expect(requestServiceMock).calledTwice;
});
});
});
Loading