Skip to content

Commit

Permalink
feat(apps/staging/prow): bump prow components to v20221216-06fc803e5c (
Browse files Browse the repository at this point in the history
…#333)

* refactor(charts/prow): split crd chart and migrate dependency from sub-dic to repo

* chore(charts/prow): bump app version

* ci: trigger chart release only when Chart.yaml file changed

* feat(apps/staging/prow): bump prow components to v20221216-06fc803e5c
  • Loading branch information
wuhuizuo authored Dec 16, 2022
1 parent 195b602 commit 14a50da
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 23,374 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/charts_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- main
paths:
- "charts/**"
- "charts/*/Chart.yaml"

jobs:
release:
Expand Down
4 changes: 4 additions & 0 deletions apps/_base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- sources
9 changes: 9 additions & 0 deletions apps/_base/sources/helm-repo-ee-ops.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: ee-ops
namespace: flux-system
spec:
interval: 30m
url: https://pingcap-qe.github.io/ee-ops
4 changes: 4 additions & 0 deletions apps/_base/sources/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- helm-repo-ee-ops.yaml
1 change: 1 addition & 0 deletions apps/prod/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../_base
- namespace.yaml
- jenkins
- mongodb
Expand Down
1 change: 1 addition & 0 deletions apps/staging/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../_base
- namespace.yaml
- jenkins
- tekton
Expand Down
53 changes: 5 additions & 48 deletions apps/staging/prow/release/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ spec:
targetNamespace: apps
chart:
spec:
chart: ./charts/prow
chart: prow
version: 0.3.0
sourceRef:
kind: GitRepository
name: flux-system
kind: HelmRepository
name: ee-ops
namespace: flux-system
interval: 5m
timeout: 5m
Expand Down Expand Up @@ -57,52 +58,8 @@ spec:
prow:
podsNamespace: ${TEST_PODS_NAMESPACE} # should delete old prow-pcm pods when changed.
githubOrg: PingCAP-QE
pcm:
image:
repository: hub.pingcap.net/ee/prow-controller-manager
tag: v20221108-93ba3423d9
deck:
image:
repository: hub.pingcap.net/ee/deck
tag: v20221108-93ba3423d9
crier:
image:
repository: hub.pingcap.net/ee/crier
tag: v20221108-93ba3423d9

ghproxy:
image:
repository: hub.pingcap.net/ee/ghproxy
tag: v20221108-93ba3423d9
hook:
image:
repository: hub.pingcap.net/ee/hook
tag: v20221108-93ba3423d9
horologium:
image:
repository: hub.pingcap.net/ee/horologium
tag: v20221108-93ba3423d9
sinker:
image:
repository: hub.pingcap.net/ee/sinker
tag: v20221108-93ba3423d9
statusReconciler:
image:
repository: hub.pingcap.net/ee/status-reconciler
tag: v20221108-93ba3423d9
tide:
image:
repository: hub.pingcap.net/ee/tide
tag: v20221108-93ba3423d9
pipeline:
image:
repository: hub.pingcap.net/ee/pipeline
tag: v20221108-93ba3423d9
jenkinsOperator:
enabled: true
image:
repository: hub.pingcap.net/ee/jenkins-operator
tag: v20221108-7045713ae7
dryRun: false
jenkinsUrl: http://jenkins:8080/jenkins/
auth:
Expand Down Expand Up @@ -145,4 +102,4 @@ spec:
# TODO(wuhuizuo): how to merge the inner yaml from value content.
- op: replace
path: /metadata/annotations.kustomize.toolkit.fluxcd.io/ssa
value: merge
value: merge
5 changes: 3 additions & 2 deletions charts/prow/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,19 @@ type: application
# time you make changes to the chart and its templates,
# including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: "0.2.0"
version: "0.3.0"

# This is the version number of the application being deployed.
# This version number should be incremented each time you make changes to the
# application. Versions are not expected to follow Semantic Versioning.
# They should reflect the version the application is using.
# It is recommended to use it with quotes.
# renovate: datasource=docker registryUrl=gcr.io depName=k8s-prow/tide
appVersion: v20220504-0b3a7e15f4
appVersion: v20221216-06fc803e5c

dependencies:
- name: prow-crd
repository: https://pingcap-qe.github.io/ee-ops
version: "0.1.0"
- name: minio
repository: https://charts.bitnami.com/bitnami
Expand Down
23 changes: 0 additions & 23 deletions charts/prow/charts/prow-crd/.helmignore

This file was deleted.

26 changes: 0 additions & 26 deletions charts/prow/charts/prow-crd/Chart.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions charts/prow/charts/prow-crd/templates/_helpers.tpl

This file was deleted.

Loading

0 comments on commit 14a50da

Please sign in to comment.