Skip to content

OWLS-73891 part 1: update warning messages and fix a helm upgrade issue #1253

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 13, 2019
Merged

OWLS-73891 part 1: update warning messages and fix a helm upgrade issue #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9c4420
OWLS-73891 part 1 - fix stale domain watcher and add namespace in sec…
doxiao Sep 3, 2019
c6c2cf5
More cleanup of stale states associated with a recreated namespace
doxiao Sep 11, 2019
4134fe9
Merge remote-tracking branch 'origin/develop' into owls-73891-fix1
doxiao Sep 12, 2019
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
4 changes: 4 additions & 0 deletions operator/src/main/java/oracle/kubernetes/operator/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,10 @@ private static void stopNamespaces(Collection<String> namespacesToStop) {
stopping.set(true);
}
isNamespaceStarted.remove(ns);
domainWatchers.remove(ns);
eventWatchers.remove(ns);
podWatchers.remove(ns);
serviceWatchers.remove(ns);
}
}

Expand Down
6 changes: 3 additions & 3 deletions operator/src/main/java/oracle/kubernetes/operator/helpers/HealthCheckHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public static void performSecurityChecks(

// Validate RBAC or ABAC policies allow service account to perform required operations
AuthorizationProxy ap = new AuthorizationProxy();
LOGGER.info(MessageKeys.VERIFY_ACCESS_START);
LOGGER.info(MessageKeys.VERIFY_ACCESS_START, ns);

if (version.isRulesReviewSupported()) {
boolean rulesReviewSuccessful = true;
Expand Down Expand Up @@ -150,7 +150,7 @@ public static void performSecurityChecks(
for (AuthorizationProxy.Operation op : namespaceAccessChecks.get(r)) {

if (!ap.check(op, r, null, AuthorizationProxy.Scope.namespace, ns)) {
LOGGER.warning(MessageKeys.VERIFY_ACCESS_DENIED, op, r.getResource());
LOGGER.warning(MessageKeys.VERIFY_ACCESS_DENIED, op, r.getResource(), ns);
}
}
}
Expand All @@ -159,7 +159,7 @@ public static void performSecurityChecks(
for (AuthorizationProxy.Operation op : clusterAccessChecks.get(r)) {

if (!ap.check(op, r, null, AuthorizationProxy.Scope.cluster, null)) {
LOGGER.warning(MessageKeys.VERIFY_ACCESS_DENIED, op, r.getResource());
LOGGER.warning(MessageKeys.VERIFY_ACCESS_DENIED, op, r.getResource(), ns);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions operator/src/main/resources/Operator.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ WLSKO-0025=Got exception {0} while trying to retrieve WLS configuration from adm
WLSKO-0026=Fail to parse REST response from WLS. Json response is {0}. Exception is {1}
WLSKO-0027=Service URL is {0}
WLSKO-0028=No servers configured in WebLogic cluster with name {0}
WLSKO-0029=Verifying that operator service account can access required operations on required resources
WLSKO-0030=Access denied for operator service account for operation {0} on resource {1}
WLSKO-0029=Verifying that operator service account can access required operations on required resources in namespace {0}
WLSKO-0030=Access denied for operator service account for operation {0} on resource {1} in namespace {2}
WLSKO-0031=A namespace has not been created for the Oracle WebLogic Server Operator for Kubernetes
WLSKO-0032=A service account has not been created for the Oracle WebLogic Server Operator for Kubernetes
WLSKO-0033=RBAC authorization mode is not enabled for the Kubernetes API server: {0}. To enable RBAC, start the apiserver with --authorization-mode=RBAC
Expand Down