Merge remote-tracking branch 'origin/master' into lens_restructure

# Conflicts:
#	.eslintrc.js
#	Makefile

src/renderer/api/endpoints/pods.api.ts

@@ -173,7 +173,7 @@ export class Pod extends WorkloadKubeObject {
       };
       configMap: {
         name: string;
-      }
+      };
       secret: {
         secretName: string;
         defaultMode: number;