Skip to content

Bug fix for ClusterIP admin service annotations and labels #2334

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 2 commits into from
Apr 23, 2021
Merged

Bug fix for ClusterIP admin service annotations and labels #2334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4b3f61
fixing labels and annotations for admin service
vanajamukkara Apr 22, 2021
7a0007a
adding test for admin service annotations/labels
vanajamukkara Apr 22, 2021
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
24 changes: 24 additions & 0 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import oracle.weblogic.domain.DomainSpec;
import oracle.weblogic.domain.Model;
import oracle.weblogic.domain.ServerPod;
import oracle.weblogic.domain.ServerService;
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
import oracle.weblogic.kubernetes.annotations.Namespaces;
import oracle.weblogic.kubernetes.logging.LoggingFacade;
Expand Down Expand Up @@ -75,6 +76,7 @@
import static oracle.weblogic.kubernetes.actions.TestActions.deleteImage;
import static oracle.weblogic.kubernetes.actions.TestActions.dockerLogin;
import static oracle.weblogic.kubernetes.actions.TestActions.dockerPush;
import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
import static oracle.weblogic.kubernetes.actions.TestActions.patchDomainCustomResource;
import static oracle.weblogic.kubernetes.assertions.TestAssertions.appAccessibleInPod;
Expand Down Expand Up @@ -498,6 +500,21 @@ public void testAddSecondApp() {
logger.info("Both of the applications are running correctly after patching");
}

@Test
@Order(5)
@DisplayName("Check admin service annotations and labels")
public void testAdminServiceAnnotationsLabels() {
Domain domain1 = assertDoesNotThrow(() -> getDomainCustomResource(domainUid, domainNamespace),
String.format("getDomainCustomResource failed with ApiException when tried to get domain %s in namespace %s",
domainUid, domainNamespace));
assertTrue(
domain1.getSpec().getAdminServer().getServerService().getAnnotations().containsKey("testkey"),
"Missing expected annotation on admin service");
assertTrue(
domain1.getSpec().getAdminServer().getServerService().getLabels().containsKey("testkey"),
"Missing expected label on admin service");
}

// This method is needed in this test class, since the cleanup util
// won't cleanup the images.
@AfterEach
Expand Down Expand Up @@ -745,6 +762,10 @@ private Domain createDomainResourceWithConfigMap(String domainUid,
String domNamespace, String adminSecretName,
String repoSecretName, String encryptionSecretName,
int replicaCount, String miiImage, String configmapName) {

Map keyValueMap = new HashMap<String, String>();
keyValueMap.put("testkey", "testvalue");

// create the domain CR
Domain domain = new Domain()
.apiVersion(DOMAIN_API_VERSION)
Expand Down Expand Up @@ -772,6 +793,9 @@ private Domain createDomainResourceWithConfigMap(String domainUid,
.value("-Djava.security.egd=file:/dev/./urandom ")))
.adminServer(new AdminServer()
.serverStartState("RUNNING")
.serverService(new ServerService()
.annotations(keyValueMap)
.labels(keyValueMap))
.adminService(new AdminService()
.addChannelsItem(new Channel()
.channelName("default-secure")
Expand Down
12 changes: 10 additions & 2 deletions operator/src/main/java/oracle/kubernetes/operator/helpers/ServiceHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,20 @@ private ServerSpec getServerSpec() {

@Override
protected Map<String, String> getServiceLabels() {
return getServerSpec().getServiceLabels();
Map<String, String> serviceLabels = getServerSpec().getServiceLabels();
if (isForAdminServer()) {
serviceLabels.putAll(getDomain().getAdminServerSpec().getServiceLabels());
}
return serviceLabels;
}

@Override
protected Map<String, String> getServiceAnnotations() {
return getServerSpec().getServiceAnnotations();
Map<String, String> serviceAnnotations = getServerSpec().getServiceAnnotations();
if (isForAdminServer()) {
serviceAnnotations.putAll(getDomain().getAdminServerSpec().getServiceAnnotations());
}
return serviceAnnotations;
}

String getServerName() {
Expand Down