-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Zhiwei Yin <[email protected]>
- Loading branch information
1 parent
066a27e
commit 754f72f
Showing
9 changed files
with
161 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| apiVersion: v2 | ||
| name: mce | ||
| description: A Helm chart for MCE | ||
| version: 2.7.0 | ||
| appVersion: 2.7.0 | ||
| version: 1.0.0 | ||
| appVersion: 1.0.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,110 @@ | ||
|
|
||
| {{/* Create secret to access docker registry */}} | ||
| {{- define "imagePullSecret" }} | ||
| {{- with .Values.images }} | ||
| {{- if .imageCredentials.dockerConfigJson }} | ||
| {{- if and .imageCredentials.userName .imageCredentials.password }} | ||
| {{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .imageCredentials.registry (printf "%s:%s" .imageCredentials.userName .imageCredentials.password | b64enc) | b64enc }} | ||
| {{- else if .imageCredentials.dockerConfigJson }} | ||
| {{- printf "%s" .imageCredentials.dockerConfigJson | b64enc }} | ||
| {{- else }} | ||
| {{- printf "{}" | b64enc }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
|
|
||
| {{- define "backplaneOperatorImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/backplane-rhel9-operator:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.backplane_operator }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- define "registrationOperatorImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/registration-operator-rhel9:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.registration_operator }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- define "hypershiftAddonOperatorImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/hypershift-addon-rhel9-operator:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.hypershift_addon_operator }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- define "hypershiftOperatorImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/hypershift-rhel9-operator:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.hypershift_operator }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- define "managedclusterImportControllerImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/managedcluster-import-controller-rhel9:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.managedcluster_import_controller }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- define "multicloudManagerImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/multicloud-manager-rhel9:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.multicloud_manager }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- define "addonManagerImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/addon-manager-rhel9:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.addon_manager }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- define "workImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/work-rhel9:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.work }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- define "registrationImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/registration-rhel9:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.registration }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- define "placementImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/placement-rhel9:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.placement }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- define "kubeRbacProxyMceImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/kube-rbac-proxy-mce-rhel9:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.kube_rbac_proxy_mce }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- define "clusterlifecycleStateMetricsImage" }} | ||
| {{- if and .Values.images.registry .Values.images.tag }} | ||
| {{- printf "%s/clusterlifecycle-state-metrics-rhel9:%s" .Values.images.registry .Values.images.tag }} | ||
| {{- else }} | ||
| {{- printf "%s" .Values.images.overrides.clusterlifecycle_state_metrics }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,26 @@ | ||
|
|
||
| mceVersion: 2.8 | ||
| replicaCount: 1 | ||
| availabilityConfig: Basic | ||
|
|
||
| images: | ||
| registry: "" | ||
| tag: "" | ||
| overrides: | ||
| backplane_operator: "quay.io/stolostron/backplane-operator:2.13.0-SNAPSHOT-2024-11-26-00-59-13" | ||
| registration_operator: "quay.io/stolostron/registration-operator:2.13.0-SNAPSHOT-2024-11-26-00-59-13" | ||
| hypershift_addon_operator: "quay.io/stolostron/hypershift-addon-operator:2.13.0-SNAPSHOT-2024-11-26-00-59-13" | ||
| hypershift_operator: "quay.io/acm-d/hypershift-rhel9-operator:v2.8.0-4" | ||
| managedcluster_import_controller: "quay.io/stolostron/managedcluster-import-controller:2.13.0-SNAPSHOT-2024-11-26-00-59-13" | ||
| multicloud_manager: "quay.io/stolostron/multicloud-manager:2.13.0-SNAPSHOT-2024-11-26-00-59-13" | ||
| addon_manager: "quay.io/stolostron/addon-manager:2.13.0-SNAPSHOT-2024-11-26-00-59-13" | ||
| work: "quay.io/stolostron/work:2.13.0-SNAPSHOT-2024-11-26-00-59-13" | ||
| registration: "quay.io/stolostron/registration:2.13.0-SNAPSHOT-2024-11-26-00-59-13" | ||
| placement: "quay.io/stolostron/placement:2.13.0-SNAPSHOT-2024-11-26-00-59-13" | ||
| kube_rbac_proxy_mce: "quay.io/stolostron/kube-rbac-proxy-mce:2.13.0-SNAPSHOT-2024-11-26-00-59-13" | ||
| clusterlifecycle_state_metrics: "quay.io/stolostron/clusterlifecycle-state-metrics:2.13.0-SNAPSHOT-2024-11-26-00-59-13" | ||
|
|
||
| backplane_operator: "quay.io/acm-d/backplane-rhel9-operator:v2.8.0-13" | ||
| registration_operator: "quay.io/acm-d/registration-operator-rhel9:v2.8.0-13" | ||
| hypershift_addon_operator: "quay.io/acm-d/hypershift-addon-rhel9-operator:v2.8.0-5" | ||
| hypershift_operator: "quay.io/acm-d/hypershift-rhel9-operator:v2.8.0-14" | ||
| managedcluster_import_controller: "quay.io/acm-d/managedcluster-import-controller-rhel9:v2.8.0-13" | ||
| multicloud_manager: "quay.io/acm-d/multicloud-manager-rhel9:v2.8.0-9" | ||
| addon_manager: "quay.io/acm-d/addon-manager-rhel9:v2.8.0-13" | ||
| work: "quay.io/acm-d/work-rhel9:v2.8.0-13" | ||
| registration: "quay.io/acm-d/registration-rhel9:v2.8.0-13" | ||
| placement: "quay.io/acm-d/placement-rhel9:v2.8.0-13" | ||
| kube_rbac_proxy_mce: "quay.io/acm-d/kube-rbac-proxy-mce-rhel9:v2.8.0-13" | ||
| clusterlifecycle_state_metrics: "quay.io/acm-d/clusterlifecycle-state-metrics-rhel9:v2.8.0-10" | ||
| imageCredentials: | ||
| dockerConfigJson: "" | ||
| registry: "quay.io" | ||
| userName: "" | ||
| password: "" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters