starlingx/ansible-playbooks
Code Issues Proposed changes

Merge "Update FluxCD to v2.3.0"

Browse Source
This commit is contained in:
Zuul 2024-05-30 19:28:02 +00:00 committed by Gerrit Code Review
commit 3d7618d010
8 changed files with 10131 additions and 2469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12552
playbookconfig/src/playbooks/roles/common/fluxcd-controllers/templates/fluxcd-crds.yaml.j2
View File

File diff suppressed because it is too large Load Diff

24
playbookconfig/src/playbooks/roles/common/fluxcd-controllers/templates/fluxcd-deployments.yaml.j2
View File

@ -27,6 +27,16 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: GOMAXPROCS
valueFrom:
resourceFieldRef:
containerName: manager
resource: limits.cpu
- name: GOMEMLIMIT
valueFrom:
resourceFieldRef:
containerName: manager
resource: limits.memory
image: "{{ local_registry }}/{{ flux_helm_controller_img }}"
imagePullPolicy: IfNotPresent
livenessProbe:
@ -118,6 +128,16 @@ spec:
fieldPath: metadata.namespace
- name: TUF_ROOT
value: /tmp/.sigstore
- name: GOMAXPROCS
valueFrom:
resourceFieldRef:
containerName: manager
resource: limits.cpu
- name: GOMEMLIMIT
valueFrom:
resourceFieldRef:
containerName: manager
resource: limits.memory
image: "{{ local_registry }}/{{ flux_source_controller_img }}"
imagePullPolicy: IfNotPresent
livenessProbe:
@ -172,8 +192,10 @@ spec:
- key: "node-role.kubernetes.io/control-plane"
operator: "Exists"
effect: "NoSchedule"
priorityClassName: system-cluster-critical
securityContext:
fsGroup: 1337
serviceAccountName: default
terminationGracePeriodSeconds: 10
volumes:
- emptyDir: {}
@ -183,4 +205,4 @@ spec:
- name: log-volume
hostPath:
path: /var/log/flux
type: Directory
type: Directory

6
playbookconfig/src/playbooks/roles/common/fluxcd-controllers/templates/fluxcd-rbac.yaml.j2
View File

@ -84,6 +84,10 @@ rules:
- update
- patch
- delete
- nonResourceURLs:
- /livez/ping
verbs:
- head
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
@ -151,4 +155,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: default
namespace: flux-helm
namespace: flux-helm

2
playbookconfig/src/playbooks/roles/common/fluxcd-controllers/templates/fluxcd-service.yaml.j2
View File

@ -13,4 +13,4 @@ spec:
targetPort: http
selector:
app: source-controller
type: ClusterIP
type: ClusterIP

4
playbookconfig/src/playbooks/roles/common/fluxcd-controllers/vars/main.yml
View File

@ -2,8 +2,8 @@
fluxcd_namespace: flux-helm
fluxcd_secret_name: default-registry-key
fluxcd_resource_dir: /tmp/fluxcd
flux_helm_controller_img: docker.io/fluxcd/helm-controller:v0.35.0
flux_source_controller_img: docker.io/fluxcd/source-controller:v1.0.1
flux_helm_controller_img: docker.io/fluxcd/helm-controller:v1.0.1
flux_source_controller_img: docker.io/fluxcd/source-controller:v1.3.0
local_registry: registry.local:9001
async_timeout: 240
async_retries: 80

4
playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.24.4/system-images.yml
View File

@ -36,7 +36,7 @@ snapshot_controller_img: registry.k8s.io/sig-storage/snapshot-controller:v4.0.0
pause_img: k8s.gcr.io/pause:3.4.1
# FluxCD Images for next & current release.
flux_helm_controller_img: docker.io/fluxcd/helm-controller:v0.35.0
flux_source_controller_img: docker.io/fluxcd/source-controller:v1.0.1
flux_helm_controller_img: docker.io/fluxcd/helm-controller:v1.0.1
flux_source_controller_img: docker.io/fluxcd/source-controller:v1.3.0
flux_helm_controller_img_2212: docker.io/fluxcd/helm-controller:v0.27.0
flux_source_controller_img_2212: docker.io/fluxcd/source-controller:v0.32.1

4
playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.25.3/system-images.yml
View File

@ -27,5 +27,5 @@ cert_manager_ctl_img: quay.io/jetstack/cert-manager-ctl:v1.13.1
# in the kubernetes github repo
snapshot_controller_img: registry.k8s.io/sig-storage/snapshot-controller:v4.2.1
pause_img: k8s.gcr.io/pause:3.4.1
flux_helm_controller_img: docker.io/fluxcd/helm-controller:v0.35.0
flux_source_controller_img: docker.io/fluxcd/source-controller:v1.0.1
flux_helm_controller_img: docker.io/fluxcd/helm-controller:v1.0.1
flux_source_controller_img: docker.io/fluxcd/source-controller:v1.3.0

4
playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.28.4/system-images.yml
View File

@ -27,5 +27,5 @@ cert_manager_ctl_img: quay.io/jetstack/cert-manager-ctl:v1.13.1
# in the kubernetes github repo
snapshot_controller_img: registry.k8s.io/sig-storage/snapshot-controller:v6.1.0
pause_img: k8s.gcr.io/pause:3.4.1
flux_helm_controller_img: docker.io/fluxcd/helm-controller:v0.35.0
flux_source_controller_img: docker.io/fluxcd/source-controller:v1.0.1
flux_helm_controller_img: docker.io/fluxcd/helm-controller:v1.0.1
flux_source_controller_img: docker.io/fluxcd/source-controller:v1.3.0