DevFW-CICD/stacks
DevFW-CICD/stacks
14
0
Fork 2
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

WIP: dont merge #34

Draft
Daniel.Sy wants to merge 114 commits from development into main
pull from: development
merge into: DevFW-CICD:main
Conversation 0 Commits 114 Files changed 9 +241
Daniel.Sy commented 2025-07-31 11:20:26 +00:00
Owner
Copy link

test

test
Daniel.Sy added 114 commits 2025-07-31 11:20:26 +00:00 
- mountPath: /var/log
    name: log-storage
    readOnly: false
image: alpine:latest
      command: ["/bin/sh", "-c", "while true; do /usr/sbin/logrotate /etc/logrotate.conf; sleep 60; done"]
      securityContext:
        runAsUser: 100
      volumeMounts:
        - name: host-log-storage
          mountPath: /openbao/logs
        - name: logrotate-config
          mountPath: /etc/logrotate.conf
          subPath: logrotate.conf
#   mountPath: /etc/logrotate.conf
        #   subPath: logrotate.conf
kind: DaemonSet
metadata:
  name: openbao-logging-dir
  namespace: openbao
spec:
  selector:
    matchLabels:
      app: openbao-logging-dir
  template:
    metadata:
      labels:
        app: openbao-logging-dir
    spec:
      initContainers:
      - name: creator
        image: busybox
        command: ["/bin/sh", "-c"]
        args:
        - |
          set -e
          mkdir -p /var/log/openbao
          chown 100:100 /var/log/openbao
        securityContext:
          runAsUser: 0
        volumeMounts:
        - name: host-log
          mountPath: /var/log
      containers:
      - name: running-container
        image: busybox
        command: ["sleep", "infinity"]
      volumes:
      - name: host-log
        hostPath:
          path: /var/log
          type: Directory
image: imroc/logrotate:latest
      env:
        - name: LOGROTATE_FILE_PATTERN
          value: "/var/log/nginx/nginx_*.log"
        - name: LOGROTATE_FILESIZE
          value: "20M"
        - name: LOGROTATE_FILENUM
          value: "10"
        - name: CRON_EXPR
          value: "*/1 * * * *"
        - name: CROND_LOGLEVEL
          value: "7"
mountPath: /etc/logrotate.conf
          subPath: logrotate.conf
          readOnly: true
set -e
          useradd -u 100 logrotate
          chown logrotate:logrotate /var/lib
          tail -f /dev/null
chown 100:100 /var/lib
          tail -f /dev/null
echo "logrotate❌100:" >> /etc/group
mkdir -p /var/log/openbao
          chown 100:100 /var/log/openbao
          echo "logrotate❌100💯:/home/logrotate:/bin/sh" >> /etc/passwd
          echo "logrotate❌100:" >> /etc/group
          chown logrotate:logrotate /var/lib
runAsUser: 0
mkdir -p /var/log/openbao
          chown 100:100 /var/log/openbao
          echo "logrotate❌100💯:/home/logrotate:/bin/sh" >> /etc/passwd
          echo "logrotate❌100:" >> /etc/group
          mkdir -p /home/logrotate
          # chown 100:100 /var/lib
mountPath: /var/lib/
image: alpine:latest
chmod o+rwx /etc/group
- chmod o+rwx /etc/passwd
    - chmod o+rwx /etc/group
- |
      chmod o+rwx /etc/passwd
      chmod o+rwx /etc/group
mountPath: /etc/passwd
          subPath: passwd
- name: CRON_SCHEDULE
            value: "0 * * * *"
          - name: TINI_SUBREAPER
            value:
#   mountPath: /var/lib
- name: host-log-storage
          mountPath: /openbao/logs
mountPath: /var/lib
mkdir pupa
image: nginx:latest
      ports:
        - containerPort: 8080
      volumeMounts:
        - name: idecar-script
          mountPath: /etc/nginx
          subPath: nginx.conf
          subPathExpr: 'nginx.conf'
        - name: idecar-script
          mountPath: /tmp/sidecar.sh
          subPath: sidecar.sh
          mode: 0755
        - name: passwd-volume
          mountPath: /etc/passwd
          subPath: passwd
mountPath: /etc/passwd
                subPath: passwd
Reviewed-on: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks/pulls/31
Reviewed-by: Daniel.Sy <Daniel.Sy@telekom.de>
Daniel.Sy changed title from dont merge to WIP: dont merge 2025-07-31 11:20:39 +00:00
requested reviews from martin.mccaffery, Fritz-Leo.Ochsmann, manuel.ganter, richardrobertreitz 2025-07-31 11:20:49 +00:00
This pull request has changes conflicting with the target branch.
  • template/stacks/monitoring/alloy/values.yaml
  • template/stacks/ref-implementation/openbao/values.yaml
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin development:development
git checkout development

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff development
git checkout development
git rebase main
git checkout main
git merge --ff-only development
git checkout development
git rebase main
git checkout main
git merge --no-ff development
git checkout main
git merge --squash development
git checkout main
git merge --ff-only development
git checkout main
git merge development
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
martin.mccaffery
Fritz-Leo.Ochsmann
manuel.ganter
richardrobertreitz
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: DevFW-CICD/stacks#34
No description provided.
Delete branch "development"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?