Skip to content

🐛 correctly handle GKE-Ingress provider in controller.image helm func; correctly prefer global kubernetes provider #23

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 1 commit into from
Jul 10, 2025
Merged

🐛 correctly handle GKE-Ingress provider in controller.image helm func; correctly prefer global kubernetes provider #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions fleetconfig-controller/charts/fleetconfig-controller/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,25 +105,25 @@ Refer to the [Multicluster Controlplane configuration](https://github.com/open-c

### fleetconfig-controller parameters

| Name | Description | Value |
| --------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------- |
| `kubernetesProvider` | Kubernetes provider of the cluster that fleetconfig-controller will be installed on. Valid values are "Generic", "EKS", "GKE". | `Generic` |
| `replicas` | fleetconfig-controller replica count | `1` |
| `imageRegistry` | Image registry | `""` |
| `image.repository` | Image repository | `quay.io/open-cluster-management/fleetconfig-controller` |
| `image.tag` | Image tag | `v0.0.3` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `imagePullSecrets` | Image pull secrets | `[]` |
| `serviceAccount.annotations` | Annotations to add to the service account | `{}` |
| `containerSecurityContext.allowPrivilegeEscalation` | allowPrivilegeEscalation | `false` |
| `containerSecurityContext.capabilities.drop` | capabilities to drop | `["ALL"]` |
| `containerSecurityContext.runAsNonRoot` | runAsNonRoot | `true` |
| `resources.limits.cpu` | fleetconfig controller's cpu limit | `500m` |
| `resources.limits.memory` | fleetconfig controller's memory limit | `256Mi` |
| `resources.requests.cpu` | fleetconfig controller's cpu request | `100m` |
| `resources.requests.memory` | fleetconfig controller's memory request | `256Mi` |
| `healthCheck.port` | port the liveness & readiness probes are bound to | `9440` |
| `kubernetesClusterDomain` | kubernetes cluster domain | `cluster.local` |
| Name | Description | Value |
| --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------- |
| `kubernetesProvider` | Kubernetes provider of the cluster that fleetconfig-controller will be installed on. Valid values are "Generic", "EKS", "GKE-Ingress". | `Generic` |
| `replicas` | fleetconfig-controller replica count | `1` |
| `imageRegistry` | Image registry | `""` |
| `image.repository` | Image repository | `quay.io/open-cluster-management/fleetconfig-controller` |
| `image.tag` | Image tag | `v0.0.3` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `imagePullSecrets` | Image pull secrets | `[]` |
| `serviceAccount.annotations` | Annotations to add to the service account | `{}` |
| `containerSecurityContext.allowPrivilegeEscalation` | allowPrivilegeEscalation | `false` |
| `containerSecurityContext.capabilities.drop` | capabilities to drop | `["ALL"]` |
| `containerSecurityContext.runAsNonRoot` | runAsNonRoot | `true` |
| `resources.limits.cpu` | fleetconfig controller's cpu limit | `500m` |
| `resources.limits.memory` | fleetconfig controller's memory limit | `256Mi` |
| `resources.requests.cpu` | fleetconfig controller's cpu request | `100m` |
| `resources.requests.memory` | fleetconfig controller's memory request | `256Mi` |
| `healthCheck.port` | port the liveness & readiness probes are bound to | `9440` |
| `kubernetesClusterDomain` | kubernetes cluster domain | `cluster.local` |

### cert-manager

Expand Down
8 changes: 6 additions & 2 deletions fleetconfig-controller/charts/fleetconfig-controller/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,15 @@ This image has no additional binaries bundled, other than clusteradm.
{{- define "controller.image" -}}
{{- $baseImage := printf "%s%s:%s" .Values.imageRegistry .Values.image.repository .Values.image.tag -}}
{{- $provider := "" -}}
{{- if and .Values.global .Values.kubernetesProvider -}}
{{- if and .Values.global .Values.global.kubernetesProvider -}}
{{- $provider = .Values.global.kubernetesProvider | lower -}}
{{- else if .Values.kubernetesProvider -}}
{{- $provider = .Values.kubernetesProvider | lower -}}
{{- end -}}
{{- if or (eq $provider "eks") (eq $provider "gke") -}}
{{- if eq $provider "eks" -}}
{{- printf "%s-%s" $baseImage $provider -}}
{{- else if hasPrefix "gke" $provider -}}
{{- printf "%s-%s" $baseImage "gke" -}}
{{- else -}}
{{- $baseImage -}}
{{- end -}}
Expand Down
2 changes: 1 addition & 1 deletion fleetconfig-controller/charts/fleetconfig-controller/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ topologyResources:

## @section fleetconfig-controller parameters

## @param kubernetesProvider Kubernetes provider of the cluster that fleetconfig-controller will be installed on. Valid values are "Generic", "EKS", "GKE".
## @param kubernetesProvider Kubernetes provider of the cluster that fleetconfig-controller will be installed on. Valid values are "Generic", "EKS", "GKE-Ingress".
kubernetesProvider: "Generic"

## @param replicas fleetconfig-controller replica count
Expand Down
Loading