Skip to content

Pass credentials to generate OCIR token #2487

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 7 commits into from
Jul 30, 2021
Merged

Pass credentials to generate OCIR token #2487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
554416a
pass in credentials to delete images in ocir
sankarpn Jul 27, 2021
6e027b6
added java implementation of getting ocir token
sankarpn Jul 29, 2021
63829bc
wip
sankarpn Jul 29, 2021
08bdecf
use shell
sankarpn Jul 29, 2021
5472d8b
pass in the username password to generate repo token
sankarpn Jul 29, 2021
4e31013
remove pushing already existing image
sankarpn Jul 29, 2021
6fbc558
remove logging command with creds
sankarpn Jul 29, 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
3 changes: 0 additions & 3 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodsRestart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,9 +771,6 @@ private static void createAndVerifyMiiDomain() {
// get the pre-built image created by IntegrationTestWatcher
miiImage = MII_BASIC_IMAGE_NAME + ":" + MII_BASIC_IMAGE_TAG;

// docker login and push image to docker registry if necessary
dockerLoginAndPushImageToRegistry(miiImage);

// create docker registry secret to pull the image from registry
// this secret is used only for non-kind cluster
logger.info("Creating docker registry secret in namespace {0}", domainNamespace);
Expand Down
10 changes: 8 additions & 2 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/ImageBuilders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ public void close() {
if (DOMAIN_IMAGES_REPO.contains("ocir.io")) {
String token = getOcirToken();
if (token != null) {
logger.info("Deleting these images from OCIR");
logger.info(String.join(", ", pushedImages));
for (String image : pushedImages) {
deleteImageOcir(token, image);
}
Expand All @@ -375,10 +377,14 @@ public void close() {
private String getOcirToken() {
LoggingFacade logger = getLogger();
Path scriptPath = Paths.get(RESOURCE_DIR, "bash-scripts", "ocirtoken.sh");
String cmd = scriptPath.toFile().getAbsolutePath();
StringBuilder cmd = new StringBuilder()
.append(scriptPath.toFile().getAbsolutePath())
.append(" -u " + OCIR_USERNAME)
.append(" -p \"" + OCIR_PASSWORD + "\"")
.append(" -e " + OCIR_REGISTRY);
ExecResult result = null;
try {
result = ExecCommand.exec(cmd, true);
result = ExecCommand.exec(cmd.toString(), true);
} catch (Exception e) {
logger.info("Got exception while running command: {0}", cmd);
logger.info(e.toString());
Expand Down