Skip to content

Commit 42f1c4a

Browse files
committed
removed version check logic that would leverage ubinit with java 17, to let it default to java 21 always
Signed-off-by: Jeromy Cannon <[email protected]>
1 parent 22bf948 commit 42f1c4a

File tree

3 files changed

+0
-34
lines changed

3 files changed

+0
-34
lines changed

src/commands/network.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,6 @@ export class NetworkCommand extends BaseCommand {
168168
// do not deploy mirror node until after we have the updated address book
169169
valuesArg += ` --set "telemetry.prometheus.svcMonitor.enabled=${config.enablePrometheusSvcMonitor}"`;
170170

171-
if (config.releaseTag) {
172-
const rootImage = helpers.getRootImageRepository(config.releaseTag);
173-
valuesArg += ` --set "defaults.root.image.repository=${rootImage}"`;
174-
}
175-
176171
valuesArg += ` --set "defaults.volumeClaims.enabled=${config.persistentVolumeClaims}"`;
177172

178173
// Iterate over each node and set static IPs for HAProxy

src/core/helpers.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import os from 'os';
1919
import path from 'path';
2020
import util from 'util';
2121
import {SoloError} from './errors.js';
22-
import * as semver from 'semver';
2322
import {Templates} from './templates.js';
2423
import {ROOT_DIR} from './constants.js';
2524
import * as constants from './constants.js';
@@ -73,20 +72,6 @@ export function packageVersion(): string {
7372
return packageJson.version;
7473
}
7574

76-
/**
77-
* Return the required root image for a platform version
78-
* @param releaseTag - platform version
79-
*/
80-
export function getRootImageRepository(releaseTag: string) {
81-
// @ts-ignore
82-
const releaseVersion = semver.parse(releaseTag, {includePrerelease: true}) as Semver;
83-
if (releaseVersion.minor < 46) {
84-
return 'hashgraph/solo-containers/ubi8-init-java17';
85-
}
86-
87-
return 'hashgraph/solo-containers/ubi8-init-java21';
88-
}
89-
9075
export function getTmpDir() {
9176
return fs.mkdtempSync(path.join(os.tmpdir(), 'solo-'));
9277
}

test/unit/core/helpers.test.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,4 @@ describe('Helpers', () => {
4646
expect(p.version).not.to.be.null;
4747
expect(p.version).to.deep.equal(helpers.packageVersion());
4848
});
49-
50-
each([
51-
{input: 'v0.42.5', output: 'hashgraph/solo-containers/ubi8-init-java17'},
52-
{input: 'v0.45.1', output: 'hashgraph/solo-containers/ubi8-init-java17'},
53-
{input: 'v0.46.0', output: 'hashgraph/solo-containers/ubi8-init-java21'},
54-
{input: 'v0.47.1', output: 'hashgraph/solo-containers/ubi8-init-java21'},
55-
{input: 'v0.47.1-alpha.0', output: 'hashgraph/solo-containers/ubi8-init-java21'},
56-
{input: HEDERA_PLATFORM_VERSION, output: 'hashgraph/solo-containers/ubi8-init-java21'},
57-
]).it(
58-
'should determine root-image for Hedera platform version',
59-
({input, output}: {input: string; output: string}) => {
60-
expect(helpers.getRootImageRepository(input)).to.equal(output);
61-
},
62-
);
6349
});

0 commit comments

Comments
 (0)