Skip to content

fix: avoid maas-controller env value + valueFrom kustomize merge #657

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
openshift-merge-bot merged 2 commits into from
Apr 1, 2026
Merged

fix: avoid maas-controller env value + valueFrom kustomize merge #657

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
2d9a89a
Fixing integration with Opeartor
jland-redhat Apr 1, 2026
e2a88b6
Making the two values optional
jland-redhat Apr 1, 2026
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
8 changes: 2 additions & 6 deletions deployment/base/maas-controller/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ spec:
- --maas-api-namespace=$(MAAS_API_NAMESPACE)
- --maas-subscription-namespace=$(MAAS_SUBSCRIPTION_NAMESPACE)
- --cluster-audience=$(CLUSTER_AUDIENCE)
- --metadata-cache-ttl=$(METADATA_CACHE_TTL)
- --authz-cache-ttl=$(AUTHZ_CACHE_TTL)
- --metadata-cache-ttl=60
- --authz-cache-ttl=60
env:
- name: GATEWAY_NAME
value: "maas-default-gateway"
Expand All @@ -48,10 +48,6 @@ spec:
value: "models-as-a-service"
- name: CLUSTER_AUDIENCE
value: "https://kubernetes.default.svc"
- name: METADATA_CACHE_TTL
value: "60"
- name: AUTHZ_CACHE_TTL
value: "60"
image: maas-controller
name: manager
imagePullPolicy: Always
Expand Down
14 changes: 12 additions & 2 deletions deployment/overlays/odh/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,29 @@ patches:
spec:
containers:
- name: manager
args:
- --leader-elect
- --health-probe-bind-address=:8081
- --gateway-name=$(GATEWAY_NAME)
- --gateway-namespace=$(GATEWAY_NAMESPACE)
- --maas-api-namespace=$(MAAS_API_NAMESPACE)
- --maas-subscription-namespace=$(MAAS_SUBSCRIPTION_NAMESPACE)
- --cluster-audience=$(CLUSTER_AUDIENCE)
- --metadata-cache-ttl=$(METADATA_CACHE_TTL)
- --authz-cache-ttl=$(AUTHZ_CACHE_TTL)
env:
- name: METADATA_CACHE_TTL
valueFrom:
configMapKeyRef:
key: metadata-cache-ttl
name: maas-parameters
optional: true
optional: false
- name: AUTHZ_CACHE_TTL
valueFrom:
configMapKeyRef:
key: authz-cache-ttl
name: maas-parameters
optional: true
optional: false
target:
kind: Deployment
name: maas-controller
Expand Down
Loading