Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d0fe6a3

Browse filesBrowse files
committed
Fallback for empty configfile entries, closes #66
- Implemented fallback - Introducing EKubeFiles class for shared access
1 parent 1d6bb53 commit d0fe6a3
Copy full SHA for d0fe6a3

3 files changed

+35-4Lines changed: 35 additions & 4 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎ekube-plugin/src/main/java-eclipse/de/jcup/ekube/preferences/EKubePreferences.java‎

Copy file name to clipboardExpand all lines: ekube-plugin/src/main/java-eclipse/de/jcup/ekube/preferences/EKubePreferences.java
+7-3Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* and limitations under the License.
1414
*
1515
*/
16-
package de.jcup.ekube.preferences;
16+
package de.jcup.ekube.preferences;
1717

1818
import java.io.File;
1919
import java.util.Arrays;
@@ -28,6 +28,7 @@
2828

2929
import de.jcup.eclipse.commons.ui.ColorUtil;
3030
import de.jcup.ekube.Activator;
31+
import de.jcup.ekube.core.EKubeFiles;
3132

3233
public class EKubePreferences {
3334

@@ -94,6 +95,9 @@ public static EKubePreferences getInstance() {
9495

9596
public File getKubeConfigFile() {
9697
String path = getPreferenceStore().getString(EKubePreferenceConstants.KUBE_CONFIGFILE_PATH.getId());
98+
if (path==null || path.trim().equals("")){
99+
return EKubeFiles.getDefaultKubeConfigFile();
100+
}
97101
return new File(path);
98102
}
99103

@@ -109,8 +113,8 @@ public boolean getFilterNamespacesEnabled() {
109113
public boolean areExperimentalFeaturesEnabled() {
110114
return getBooleanPreference(EKubePreferenceConstants.ENABLE_EXPERIMENTAL_FEATURES);
111115
}
112-
113-
public int getLogLinesToFetch(){
116+
117+
public int getLogLinesToFetch() {
114118
return getPreferenceStore().getInt(EKubePreferenceConstants.LOG_LINES_TO_FETCH.getId());
115119
}
116120

Collapse file

‎ekube-plugin/src/main/java/de/jcup/ekube/core/DefaultEKubeConfiguration.java‎

Copy file name to clipboardExpand all lines: ekube-plugin/src/main/java/de/jcup/ekube/core/DefaultEKubeConfiguration.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public DefaultEKubeConfiguration() {
3232
}
3333

3434
private void setDefaults() {
35-
kubeConfigFile = new File(System.getProperty("user.home") + "/.kube/config");
35+
kubeConfigFile = EKubeFiles.getDefaultKubeConfigFile();
3636
filteredNamespaces.add("kube-system");
3737
}
3838

Collapse file
+27Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package de.jcup.ekube.core;
2+
3+
import java.io.File;
4+
5+
public class EKubeFiles {
6+
7+
public static File getUserHome() {
8+
File userHomeFile = new File(System.getProperty("user.home"));
9+
return userHomeFile;
10+
}
11+
12+
public static File getEKubeHome() {
13+
File userHomeFile = new File(getUserHome(), "./ekube");
14+
return userHomeFile;
15+
}
16+
17+
18+
public static File getEKubeTempFolder() {
19+
File userHomeFile = new File(getEKubeHome(), "./ekube");
20+
return userHomeFile;
21+
}
22+
23+
public static File getDefaultKubeConfigFile() {
24+
return new File(getUserHome(), ".kube/config");
25+
}
26+
27+
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.