Skip to content

Commit

Permalink
Run build-definitions CI in konflux-ci namespace
Browse files Browse the repository at this point in the history
STONEBLD-2339

After konflux-ci/build-definitions#1041, the
build-definitions pipelines will need push access to quay.io/konflux-ci.

Run the pipelines in the konflux-ci namespace, where the
appstudio-pipeline service account has quay.io/konflux-ci push access by
default.

Also add redhat-appstudio-tekton-catalog-build-definitions-pull-secret
to the konflux-ci namespace. It is needed for push access to
quay.io/redhat-appstudio-tekton-catalog. Previously, the secret lived in
the tekton-ci namespace (but wasn't defined anywhere).

Signed-off-by: Adam Cmiel <[email protected]>
  • Loading branch information
chmeliik committed May 28, 2024
1 parent 648808f commit de50046
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 7 deletions.
7 changes: 7 additions & 0 deletions components/konflux-ci/base/repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,10 @@ metadata:
name: ci-helper-app
spec:
url: "https://github.com/konflux-ci/ci-helper-app"
---
apiVersion: pipelinesascode.tekton.dev/v1alpha1
kind: Repository
metadata:
name: build-definitions
spec:
url: "https://github.com/konflux-ci/build-definitions"
1 change: 1 addition & 0 deletions components/konflux-ci/production/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ resources:
- ../base/external-secrets
- plnsvc-ci-secret.yaml
- plnsvc-codecov-secret.yaml
- redhat-appstudio-tekton-catalog-build-definitions-pull-secret.yaml

patches:
- path: quay-push-secret-konflux-ci.yaml
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: redhat-appstudio-tekton-catalog-build-definitions-pull-secret
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: "-1"
spec:
dataFrom:
- extract:
key: production/build/tekton-ci/redhat-appstudio-tekton-catalog-build-definitions-pull-secret
refreshInterval: 15m
secretStoreRef:
kind: ClusterSecretStore
name: appsre-stonesoup-vault
target:
creationPolicy: Owner
deletionPolicy: Delete
name: redhat-appstudio-tekton-catalog-build-definitions-pull-secret
template:
engineVersion: v2
type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: "{{ .config }}"
7 changes: 0 additions & 7 deletions components/tekton-ci/base/repository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,6 @@ spec:
---
apiVersion: pipelinesascode.tekton.dev/v1alpha1
kind: Repository
metadata:
name: build-definitions
spec:
url: "https://github.com/konflux-ci/build-definitions"
---
apiVersion: pipelinesascode.tekton.dev/v1alpha1
kind: Repository
metadata:
name: jvm-build-service
spec:
Expand Down

0 comments on commit de50046

Please sign in to comment.