Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 4 additions & 5 deletions konflux-configs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ oc get applications -n $NAMESPACE
oc get components -n $NAMESPACE

# Check service accounts
oc get sa -n $NAMESPACE konflux-configuration-as-code-deployer
oc get sa -n $NAMESPACE konflux-bot-1
```

### Step 4: Upgrade to Custom Build Pipeline
Expand Down Expand Up @@ -223,8 +223,8 @@ environment-specific overlays (dev/prod).
- **Trigger**: ReleasePlan with `auto-release: true` in
`base/release-plan/konflux-manifests/base/releaseplan.yaml`
- **Pipeline**: `pipelines/konflux/deploy-config.yaml`
- **Service Account**: `konflux-configuration-as-code-deployer`
(defined in `base/release-plan/konflux-manifests/base/rbac.yaml`)
- **Service Account**: `konflux-bot-1`
(defined in `base/release-plan/konflux-manifests/base/konflux-bot-1.yaml`)
- **Process**:
- Task `extract-and-apply-manifests` extracts `/manifests.yaml`
from built image
Expand Down Expand Up @@ -252,8 +252,7 @@ konflux-configs/
│ ├── release-plan/ # Release automation
│ │ └── konflux-manifests/ # CAC deployment release plan
│ └── service-account/ # RBAC for automation
│ ├── promote-to-candidate-sa.yaml
│ └── release-sa.yaml
│ └── konflux-bot-0.yaml
├── overlay/ # Environment-specific configs
│ ├── dev/ # Development environment
│ │ └── kustomization.yaml # namespace: rhtas-dev-tenant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
value: "false"
- name: type
value: "component"
serviceAccountName: rhtas-build-bot
serviceAccountName: konflux-bot-0
pipelineRef:
resolver: git
params:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
value: "false"
- name: type
value: "component"
serviceAccountName: rhtas-build-bot
serviceAccountName: konflux-bot-0
pipelineRef:
resolver: git
params:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
value: "fbc"
- name: file-name
value: "{{.operator}}-fbc.json"
serviceAccountName: rhtas-build-bot
serviceAccountName: konflux-bot-0
pipelineRef:
resolver: git
params:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
value: "false"
- name: type
value: "operator"
serviceAccountName: rhtas-build-bot
serviceAccountName: konflux-bot-0
pipelineRef:
resolver: git
params:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: konflux-configuration-as-code-deployer
name: konflux-bot-1
labels:
rhtas.redhat.com/sa-group: konflux-configuration-as-code-deployer
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: konflux-configuration-as-code-role
name: konflux-bot-1-role
rules:
- apiGroups: ["appstudio.redhat.com"]
resources: ["applications", "components", "integrationtestscenarios", "releaseplans", "snapshots", "imagerepositories"]
Expand All @@ -25,12 +27,12 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: konflux-configuration-as-code-deployer-rolebinding
name: konflux-bot-1-rolebinding
subjects:
- kind: ServiceAccount
name: konflux-configuration-as-code-deployer
name: konflux-bot-1
roleRef:
kind: Role
name: konflux-configuration-as-code-role
name: konflux-bot-1-role
apiGroup: rbac.authorization.k8s.io
---
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
resources:
- releaseplan.yaml
- rbac.yaml
- konflux-bot-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
spec:
application: konflux
tenantPipeline:
serviceAccountName: konflux-configuration-as-code-deployer
serviceAccountName: konflux-bot-1
pipelineRef:
resolver: git
params:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: rhtas-build-bot
name: konflux-bot-0
namespace: rhtas-tenant
labels:
rhtas.redhat.com/sa-group: build-ci-release
imagePullSecrets:
- name: registry-redhat-io-pull-secret
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: rhtas-build-bot-role
name: konflux-bot-0-role
namespace: rhtas-tenant
rules:
- apiGroups: ["appstudio.redhat.com"]
Expand All @@ -21,14 +25,14 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: rhtas-build-bot-rolebinding
name: konflux-bot-0-rolebinding
namespace: rhtas-tenant
subjects:
- kind: ServiceAccount
name: rhtas-build-bot
name: konflux-bot-0
namespace: rhtas-tenant
roleRef:
kind: Role
name: rhtas-build-bot-role
name: konflux-bot-0-role
apiGroup: rbac.authorization.k8s.io
---
3 changes: 1 addition & 2 deletions konflux-configs/base/service-account/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- promote-to-candidate-sa.yaml
- release-sa.yaml
- konflux-bot-0.yaml
29 changes: 0 additions & 29 deletions konflux-configs/base/service-account/release-sa.yaml

This file was deleted.