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.

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

Feature/cg 490 networkPolicy #15

Merged
merged 6 commits into from
Jan 17, 2022
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fix(services): update service connection names to plural
tyler-dunkel committed Jan 17, 2022
commit 5a4030df7c31c910e56a54b8d6a336eba2ea2a67
17 changes: 17 additions & 0 deletions src/enums/pluralization.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
export default {
cronJob: 'cronJobs',
deployment: 'deployments',
ingress: 'ingresses',
job: 'jobs',
namespace: 'namespaces',
networkPolicy: 'networkPolicies',
node: 'nodes',
persistentVolume: 'persistentVolumes',
persistentVolumeClaim: 'persistentVolumeClaims',
pod: 'pods',
role: 'roles',
secret: 'secrets',
service: 'services',
serviceAccount: 'serviceAccounts',
storageClass: 'storageClasses'
}
2 changes: 1 addition & 1 deletion src/services/cronJob/schema.graphql
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ type k8sCronJob {
metadata: k8sMetadata
spec: k8sCronJobSpec
status: k8sCronJobStatus
namespace: [k8sNamespace] @hasInverse(field: cronJob)
namespace: [k8sNamespace] @hasInverse(field: cronJobs)
}

type k8sCronJobSpec {
2 changes: 1 addition & 1 deletion src/services/deployment/schema.graphql
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ type k8sDeployment {
metadata: k8sMetadata
spec: k8sDeploymentSpec
status: k8sDeploymentStatus
namespace: [k8sNamespace] @hasInverse(field: deployment)
namespace: [k8sNamespace] @hasInverse(field: deployments)
}

type k8sDeploymentSpec {
2 changes: 1 addition & 1 deletion src/services/ingress/schema.graphql
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ type k8sIngress {
metadata: k8sMetadata
spec: k8sIngressSpec
status: k8sIngressStatus
namespace: [k8sNamespace] @hasInverse(field: ingress)
namespace: [k8sNamespace] @hasInverse(field: ingresses)
}

type k8sIngressSpec {
2 changes: 1 addition & 1 deletion src/services/job/schema.graphql
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ type k8sJob {
metadata: k8sMetadata
spec: k8sJobSpec
status: k8sJobStatus
namespace: [k8sNamespace] @hasInverse(field: job)
namespace: [k8sNamespace] @hasInverse(field: jobs)
}

type k8sJobSpec {
3 changes: 2 additions & 1 deletion src/services/namespace/connections.ts
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ import isEmpty from 'lodash/isEmpty'
import { ServiceConnection } from '@cloudgraph/sdk'
import { V1Namespace } from '@kubernetes/client-node'
import services from '../../enums/services'
import plurals from '../../enums/pluralization'

/**
* Service Account
@@ -36,7 +37,7 @@ export default ({
id: service.metadata?.uid,
resourceType: entity.name,
relation: 'child',
field: entity.name
field: plurals[entity.name] ?? entity.name
})
}
}
28 changes: 14 additions & 14 deletions src/services/namespace/schema.graphql
Original file line number Diff line number Diff line change
@@ -6,20 +6,20 @@ type k8sNamespace {
metadata: k8sMetadata
spec: k8sNamespaceSpec
status: k8sNamespaceStatus
networkPolicy: [k8sNetworkPolicy] @hasInverse(field: namespace)
node: [k8sNode] @hasInverse(field: namespace)
pod: [k8sPod] @hasInverse(field: namespace)
deployment: [k8sDeployment] @hasInverse(field: namespace)
ingress: [k8sIngress] @hasInverse(field: namespace)
secret: [k8sSecret] @hasInverse(field: namespace)
service: [k8sService] @hasInverse(field: namespace)
serviceAccount: [k8sServiceAccount] @hasInverse(field: namespace)
storageClass: [k8sStorageClass] @hasInverse(field: namespace)
persistentVolume: [k8sPersistentVolume] @hasInverse(field: namespace)
persistentVolumeClaim: [k8sPersistentVolumeClaim] @hasInverse(field: namespace)
role: [k8sRole] @hasInverse(field: namespace)
job: [k8sJob] @hasInverse(field: namespace)
cronJob: [k8sCronJob] @hasInverse(field: namespace)
networkPolicies: [k8sNetworkPolicy] @hasInverse(field: namespace)
nodes: [k8sNode] @hasInverse(field: namespace)
pods: [k8sPod] @hasInverse(field: namespace)
deployments: [k8sDeployment] @hasInverse(field: namespace)
ingresses: [k8sIngress] @hasInverse(field: namespace)
secrets: [k8sSecret] @hasInverse(field: namespace)
services: [k8sService] @hasInverse(field: namespace)
serviceAccounts: [k8sServiceAccount] @hasInverse(field: namespace)
storageClasses: [k8sStorageClass] @hasInverse(field: namespace)
persistentVolumes: [k8sPersistentVolume] @hasInverse(field: namespace)
persistentVolumeClaims: [k8sPersistentVolumeClaim] @hasInverse(field: namespace)
roles: [k8sRole] @hasInverse(field: namespace)
jobs: [k8sJob] @hasInverse(field: namespace)
cronJobs: [k8sCronJob] @hasInverse(field: namespace)
}

type k8sNamespaceSpec @generate(
2 changes: 1 addition & 1 deletion src/services/networkPolicy/schema.graphql
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ type k8sNetworkPolicy {
kind: String @search(by: [hash, regexp])
metadata: k8sMetadata
spec: k8sNetworkPolicySpec
namespace: [k8sNamespace] @hasInverse(field: networkPolicy)
namespace: [k8sNamespace] @hasInverse(field: networkPolicies)
}

type k8sNetworkPolicySpec {
2 changes: 1 addition & 1 deletion src/services/node/schema.graphql
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ type k8sNode {
metadata: k8sMetadata
spec: k8sNodeSpec
status: k8sNodeStatus
namespace: [k8sNamespace] @hasInverse(field: node)
namespace: [k8sNamespace] @hasInverse(field: nodes)
}

type k8sMetadata @generate(
2 changes: 1 addition & 1 deletion src/services/persistentVolume/schema.graphql
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ type k8sPersistentVolume {
metadata: k8sMetadata
spec: k8sPersistentVolumeSpec
status: k8sPersistentVolumeStatus
namespace: [k8sNamespace] @hasInverse(field: persistentVolume)
namespace: [k8sNamespace] @hasInverse(field: persistentVolumes)
}

type k8sPersistentVolumeSpec @generate(
2 changes: 1 addition & 1 deletion src/services/persistentVolumeClaim/schema.graphql
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ type k8sPersistentVolumeClaim {
metadata: k8sMetadata
spec: k8sPersistentVolumeClaimSpec
status: k8sPersistentVolumeClaimStatus
namespace: [k8sNamespace] @hasInverse(field: persistentVolumeClaim)
namespace: [k8sNamespace] @hasInverse(field: persistentVolumeClaims)
}

type k8sPersistentVolumeClaimSpec @generate(
2 changes: 1 addition & 1 deletion src/services/pod/schema.graphql
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ type k8sPod {
metadata: k8sMetadata
spec: k8sPodSpec
status: k8sPodStatus
namespace: [k8sNamespace] @hasInverse(field: pod)
namespace: [k8sNamespace] @hasInverse(field: pods)
}

type k8sPodSpec {
2 changes: 1 addition & 1 deletion src/services/role/schema.graphql
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ type k8sRole {
kind: String @search(by: [hash, regexp])
metadata: k8sMetadata
rules: [k8sRule]
namespace: [k8sNamespace] @hasInverse(field: role)
namespace: [k8sNamespace] @hasInverse(field: roles)
}

type k8sRule {
2 changes: 1 addition & 1 deletion src/services/secret/schema.graphql
Original file line number Diff line number Diff line change
@@ -8,5 +8,5 @@ type k8sSecret {
immutable: Boolean @search
stringData: [k8sKeyValueArray]
type: String @search(by: [hash, regexp])
namespace: [k8sNamespace] @hasInverse(field: secret)
namespace: [k8sNamespace] @hasInverse(field: secrets)
}
2 changes: 1 addition & 1 deletion src/services/service/schema.graphql
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ type k8sService {
metadata: k8sMetadata
spec: k8sServiceSpec
status: k8sServiceStatus
namespace: [k8sNamespace] @hasInverse(field: service)
namespace: [k8sNamespace] @hasInverse(field: services)
}

type k8sServiceSpec {
2 changes: 1 addition & 1 deletion src/services/serviceAccount/schema.graphql
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ type k8sServiceAccount {
automountServiceAccountToken: Boolean @search
imagePullSecrets: [k8sImagePullSecret],
secrets: [k8sServiceAccountSecret]
namespace: [k8sNamespace] @hasInverse(field: serviceAccount)
namespace: [k8sNamespace] @hasInverse(field: serviceAccounts)
}

type k8sImagePullSecret {
2 changes: 1 addition & 1 deletion src/services/storageClass/schema.graphql
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ type k8sStorageClass {
parameters: [k8sKeyValueArray]
reclaimPolicy: String @search(by: [hash, regexp])
volumeBindingMode: String @search(by: [hash, regexp])
namespace: [k8sNamespace] @hasInverse(field: storageClass)
namespace: [k8sNamespace] @hasInverse(field: storageClasses)
}

type k8sStorageClassAllowedTopology {
28 changes: 14 additions & 14 deletions src/types/generated.ts
Original file line number Diff line number Diff line change
@@ -341,20 +341,20 @@ export type K8sNamespace = {
metadata?: Maybe<K8sMetadata>;
spec?: Maybe<K8sNamespaceSpec>;
status?: Maybe<K8sNamespaceStatus>;
networkPolicy?: Maybe<Array<Maybe<K8sNetworkPolicy>>>;
node?: Maybe<Array<Maybe<K8sNode>>>;
pod?: Maybe<Array<Maybe<K8sPod>>>;
deployment?: Maybe<Array<Maybe<K8sDeployment>>>;
ingress?: Maybe<Array<Maybe<K8sIngress>>>;
secret?: Maybe<Array<Maybe<K8sSecret>>>;
service?: Maybe<Array<Maybe<K8sService>>>;
serviceAccount?: Maybe<Array<Maybe<K8sServiceAccount>>>;
storageClass?: Maybe<Array<Maybe<K8sStorageClass>>>;
persistentVolume?: Maybe<Array<Maybe<K8sPersistentVolume>>>;
persistentVolumeClaim?: Maybe<Array<Maybe<K8sPersistentVolumeClaim>>>;
role?: Maybe<Array<Maybe<K8sRole>>>;
job?: Maybe<Array<Maybe<K8sJob>>>;
cronJob?: Maybe<Array<Maybe<K8sCronJob>>>;
networkPolicies?: Maybe<Array<Maybe<K8sNetworkPolicy>>>;
nodes?: Maybe<Array<Maybe<K8sNode>>>;
pods?: Maybe<Array<Maybe<K8sPod>>>;
deployments?: Maybe<Array<Maybe<K8sDeployment>>>;
ingresses?: Maybe<Array<Maybe<K8sIngress>>>;
secrets?: Maybe<Array<Maybe<K8sSecret>>>;
services?: Maybe<Array<Maybe<K8sService>>>;
serviceAccounts?: Maybe<Array<Maybe<K8sServiceAccount>>>;
storageClasses?: Maybe<Array<Maybe<K8sStorageClass>>>;
persistentVolumes?: Maybe<Array<Maybe<K8sPersistentVolume>>>;
persistentVolumeClaims?: Maybe<Array<Maybe<K8sPersistentVolumeClaim>>>;
roles?: Maybe<Array<Maybe<K8sRole>>>;
jobs?: Maybe<Array<Maybe<K8sJob>>>;
cronJobs?: Maybe<Array<Maybe<K8sCronJob>>>;
};

export type K8sNamespaceSpec = {