Skip to content

Commit 0d3b015

Browse files
authored
Merge pull request #73 from projectsyn/more-oke-adjustments
Additional configuration to support OKE
2 parents cbe9f4a + fb2fb00 commit 0d3b015

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

component/app.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ local kap = import 'lib/kapitan.libjsonnet';
22
local inv = kap.inventory();
33
local params = inv.parameters.crossplane;
44
local argocd = import 'lib/argocd.libjsonnet';
5-
local on_openshift4 = inv.parameters.facts.distribution == 'openshift4';
5+
local on_openshift4 = std.member([ 'openshift4', 'oke' ], inv.parameters.facts.distribution);
66

77
local ignore_diff_sa = {
88
group: '',

postprocess/patch_operator_deployment.jsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
local com = import 'lib/commodore.libjsonnet';
22
local inv = com.inventory();
33

4-
local on_openshift4 = inv.parameters.facts.distribution;
4+
local on_openshift4 = std.member([ 'openshift4', 'oke' ], inv.parameters.facts.distribution);
55
local run_as_user = {
66
runAsUser: null,
77
};
@@ -31,7 +31,7 @@ local fixup(obj) =
3131
else
3232
obj;
3333

34-
if on_openshift4 == 'openshift4' then
34+
if on_openshift4 then
3535
com.fixupDir(std.extVar('output_path'), fixup)
3636
else
3737
{}

0 commit comments

Comments
 (0)