podname logs for log service

pull/531/head
Frostebite 2023-08-11 17:29:19 +01:00
parent 1314055a63
commit 2cb1914301
3 changed files with 10 additions and 97 deletions

52
dist/index.js generated vendored
View File

@ -3661,32 +3661,9 @@ class KubernetesLogService {
return kubeClient.createNamespacedServiceAccount(namespace, serviceAccount); return kubeClient.createNamespacedServiceAccount(namespace, serviceAccount);
} }
static async createLogDeployment(namespace, kubeClient, kubeClientCore) { static async createLogDeployment(namespace, kubeClient, kubeClientCore) {
// json if (!process.env.LOG_SERVICE_IP) {
/* return `0.0.0.0`;
apiVersion: extensions/v1beta1 }
kind: Deployment
metadata:
creationTimestamp: null
labels:
service: http-fileserver
name: http-fileserver
spec:
replicas: 1
strategy: {}
template:
metadata:
creationTimestamp: null
labels:
service: http-fileserver
spec:
containers:
- image: pgaertig/nginx-big-upload:latest
imagePullPolicy: Always
name: http-fileserver
resources: {}
restartPolicy: Always
status: {}
*/
// create a deployment with above json // create a deployment with above json
const deployment = new k8s.V1Deployment(); const deployment = new k8s.V1Deployment();
deployment.apiVersion = 'apps/v1'; deployment.apiVersion = 'apps/v1';
@ -3751,7 +3728,7 @@ class KubernetesLogService {
cloud_runner_logger_1.default.log(`Pod status: ${podStatus}`); cloud_runner_logger_1.default.log(`Pod status: ${podStatus}`);
continue; continue;
} }
const logs = await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podname} -f --timestamps`, false, true); const logs = await cloud_runner_system_1.CloudRunnerSystem.Run(`kubectl logs ${podname} -f --timestamps -p`, false, true);
cloud_runner_logger_1.default.log(`Logs: ${logs}`); cloud_runner_logger_1.default.log(`Logs: ${logs}`);
// get cluster ip // get cluster ip
const ip = service.body?.spec?.clusterIP; const ip = service.body?.spec?.clusterIP;
@ -3765,27 +3742,6 @@ class KubernetesLogService {
} }
// create kubernetes service to expose deployment // create kubernetes service to expose deployment
static async createLogServiceExpose(namespace, kubeClient) { static async createLogServiceExpose(namespace, kubeClient) {
// json
/*
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
labels:
service: http-fileserver
name: http-fileserver
spec:
ports:
- name: 80-80
port: 80
protocol: TCP
targetPort: 80
selector:
service: http-fileserver
type: LoadBalancer
status:
loadBalancer: {}
*/
// create a service with above json // create a service with above json
const service = new k8s.V1Service(); const service = new k8s.V1Service();
service.apiVersion = 'v1'; service.apiVersion = 'v1';

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long

View File

@ -21,32 +21,10 @@ class KubernetesLogService {
} }
static async createLogDeployment(namespace: string, kubeClient: k8s.AppsV1Api, kubeClientCore: CoreV1Api) { static async createLogDeployment(namespace: string, kubeClient: k8s.AppsV1Api, kubeClientCore: CoreV1Api) {
// json if (!process.env.LOG_SERVICE_IP) {
/* return `0.0.0.0`;
apiVersion: extensions/v1beta1 }
kind: Deployment
metadata:
creationTimestamp: null
labels:
service: http-fileserver
name: http-fileserver
spec:
replicas: 1
strategy: {}
template:
metadata:
creationTimestamp: null
labels:
service: http-fileserver
spec:
containers:
- image: pgaertig/nginx-big-upload:latest
imagePullPolicy: Always
name: http-fileserver
resources: {}
restartPolicy: Always
status: {}
*/
// create a deployment with above json // create a deployment with above json
const deployment = new k8s.V1Deployment(); const deployment = new k8s.V1Deployment();
deployment.apiVersion = 'apps/v1'; deployment.apiVersion = 'apps/v1';
@ -126,7 +104,7 @@ status: {}
continue; continue;
} }
const logs = await CloudRunnerSystem.Run(`kubectl logs ${podname} -f --timestamps`, false, true); const logs = await CloudRunnerSystem.Run(`kubectl logs ${podname} -f --timestamps -p`, false, true);
CloudRunnerLogger.log(`Logs: ${logs}`); CloudRunnerLogger.log(`Logs: ${logs}`);
// get cluster ip // get cluster ip
@ -143,27 +121,6 @@ status: {}
// create kubernetes service to expose deployment // create kubernetes service to expose deployment
static async createLogServiceExpose(namespace: string, kubeClient: CoreV1Api) { static async createLogServiceExpose(namespace: string, kubeClient: CoreV1Api) {
// json
/*
apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
labels:
service: http-fileserver
name: http-fileserver
spec:
ports:
- name: 80-80
port: 80
protocol: TCP
targetPort: 80
selector:
service: http-fileserver
type: LoadBalancer
status:
loadBalancer: {}
*/
// create a service with above json // create a service with above json
const service = new k8s.V1Service(); const service = new k8s.V1Service();
service.apiVersion = 'v1'; service.apiVersion = 'v1';