Skip to content

Commit 943981e

Browse files
Merge pull request #33 from oracle/jira-257
Fix nginx 1.0.0 not watching ingress without ingress class
2 parents 6110be3 + 9e66933 commit 943981e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

webui/src/js/viewModels/ingress-design-view-impl.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,12 @@ function(i18n, accUtils, ko, ArrayDataProvider, BufferingDataProvider, project,
182182
// if controller is Voyager and provider is baremetal only nodeport is supported, set the default in the UI
183183
if (project.ingress.ingressControllerProvider.value === 'voyager' &&
184184
this.project.ingress.voyagerProviderMappedValue(this.project.ingress.voyagerProvider.value) === 'baremetal') {
185-
186185
newRoute.annotations = {'ingress.appscode.com/type': 'NodePort'};
187186
}
187+
// nginx 1.0.0 and above requires setting ingressClassName either at ingress object spec level or annotation.
188+
if (project.ingress.ingressControllerProvider.value === 'nginx') {
189+
newRoute.annotations = {'kubernetes.io/ingress.class': 'nginx'};
190+
}
188191

189192
project.ingress.ingressRoutes.addNewItem(newRoute);
190193
};

0 commit comments

Comments
 (0)