Change openshift to distro.openshift

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: tamalsaha

apis/fluxcd/v1alpha1/fluxcdconfig_types.go

@@ -66,6 +66,8 @@ type FluxCDConfigSpec struct {
 	ExtraObjects []runtime.RawExtension `json:"extraObjects"`
 	// +optional
 	Prometheus PrometheusSpec `json:"prometheus"`
+	// +optional
+	Distro Distro `json:"distro"`
 }
 
 type CRDsSpec struct {
@@ -367,6 +369,10 @@ type Relabeling struct {
 	Regex string `json:"regex"`
 }
 
+type Distro struct {
+	Openshift bool `json:"openshift"`
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status

apis/fluxcd/v1alpha1/openapi_generated.go

@@ -510,6 +510,13 @@ spec:
                       type: string
                     type: object
                 type: object
+              distro:
+                properties:
+                  openshift:
+                    type: boolean
+                required:
+                - openshift
+                type: object
               extraObjects:
                 items:
                   type: object

apis/fluxcd/v1alpha1/zz_generated.deepcopy.go

@@ -23,6 +23,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | cli.tolerations | list | `[]` |  |
 | clusterDomain | string | `"cluster.local"` |  |
 | crds.annotations | object | `{}` | Add annotations to all CRD resources, e.g. "helm.sh/resource-policy": keep |
+| distro.openshift | bool | `false` |  |
 | extraObjects | list | `[]` | Array of extra K8s manifests to deploy |
 | helmController.affinity | object | `{}` |  |
 | helmController.annotations."prometheus.io/port" | string | `"8080"` |  |
@@ -141,7 +142,6 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | notificationController.webhookReceiver.ingress.tls | list | `[]` |  |
 | notificationController.webhookReceiver.service.annotations | object | `{}` |  |
 | notificationController.webhookReceiver.service.labels | object | `{}` |  |
-| openshift | bool | `false` |  |
 | policies.create | bool | `true` |  |
 | prometheus.podMonitor.create | bool | `false` | Enables podMonitor endpoint |
 | prometheus.podMonitor.podMetricsEndpoints[0].port | string | `"http-prom"` |  |

crds/fluxcd.open-cluster-management.io_fluxcdconfigs.yaml

@@ -109,7 +109,7 @@ spec:
       {{- end }}
       {{- if .Values.imageAutomationController.podSecurityContext }}
       securityContext: {{ toYaml .Values.imageAutomationController.podSecurityContext | nindent 8 }}
-      {{- else if not .Values.openshift }}
+      {{- else if not .Values.distro.openshift }}
       securityContext:
         fsGroup: 1337
       {{- end}}

pkg/manager/agent-manifests/flux2/README.md

@@ -111,7 +111,7 @@ spec:
       {{- end }}
       {{- if .Values.imageReflectionController.podSecurityContext }}
       securityContext: {{ toYaml .Values.imageReflectionController.podSecurityContext | nindent 8 }}
-      {{- else if not .Values.openshift }}
+      {{- else if not .Values.distro.openshift }}
       securityContext:
         fsGroup: 1337
       {{- end}}

pkg/manager/agent-manifests/flux2/templates/image-automation-controller.yaml

@@ -127,7 +127,7 @@ spec:
       {{- end }}
       {{- if .Values.kustomizeController.podSecurityContext }}
       securityContext: {{ toYaml .Values.kustomizeController.podSecurityContext | nindent 8 }}
-      {{- else if not .Values.openshift }}
+      {{- else if not .Values.distro.openshift }}
       securityContext:
         fsGroup: 1337
       {{- end}}

pkg/manager/agent-manifests/flux2/templates/image-reflector-controller.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.openshift }}
+{{- if .Values.distro.openshift }}
 # Allow Flux controllers to run as non-root on OpenShift
 # Docs: https://fluxcd.io/flux/installation/configuration/openshift/
 apiVersion: rbac.authorization.k8s.io/v1

pkg/manager/agent-manifests/flux2/templates/kustomize-controller.yaml

@@ -112,7 +112,7 @@ spec:
       {{- end }}
       {{- if .Values.sourceController.podSecurityContext }}
       securityContext: {{ toYaml .Values.sourceController.podSecurityContext | nindent 8 }}
-      {{- else if not .Values.openshift }}
+      {{- else if not .Values.distro.openshift }}
       securityContext:
         fsGroup: 1337
       {{- end}}