Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert: "feat: Bump rook-ceph to v1.12.3" #1699

Merged
merged 1 commit into from
Oct 26, 2023
Merged

revert: "feat: Bump rook-ceph to v1.12.3" #1699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion licenses.d2iq.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ resources:
notice_path: NOTICE
ref: ${image_tag}
url: https://github.com/open-policy-agent/gatekeeper
- container_image: docker.io/rook/ceph:v1.12.3
- container_image: docker.io/rook/ceph:v1.12.1
sources:
- license_path: LICENSE
ref: ${image_tag}
Expand Down
2 changes: 1 addition & 1 deletion ...rook-ceph-cluster/1.12.3/defaults/cm.yaml → ...rook-ceph-cluster/1.12.1/defaults/cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: rook-ceph-cluster-1.12.3-d2iq-defaults
name: rook-ceph-cluster-1.12.1-d2iq-defaults
namespace: ${releaseNamespace}
data:
values.yaml: |
Expand Down
0 ...luster/1.12.3/defaults/kustomization.yaml → ...luster/1.12.1/defaults/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 ...2.3/grafana-dashboards/kustomization.yaml → ...2.1/grafana-dashboards/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 ...grafana-dashboards/rook-ceph-cluster.json → ...grafana-dashboards/rook-ceph-cluster.json
View file
Open in desktop
File renamed without changes.
0 ...2.3/grafana-dashboards/rook-ceph-osd.json → ...2.1/grafana-dashboards/rook-ceph-osd.json
View file
Open in desktop
File renamed without changes.
0 ...3/grafana-dashboards/rook-ceph-pools.json → ...1/grafana-dashboards/rook-ceph-pools.json
View file
Open in desktop
File renamed without changes.
0 ...ster/1.12.3/helmrelease/dashboard-cm.yaml → ...ster/1.12.1/helmrelease/dashboard-cm.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...uster/1.12.3/helmrelease/helmrelease.yaml → ...uster/1.12.1/helmrelease/helmrelease.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
kind: HelmRepository
name: charts.rook.io-release
namespace: kommander-flux
version: v1.12.3
version: v1.12.1
timeout: 15m
interval: 15s
install:
Expand All @@ -26,5 +26,5 @@ spec:
releaseName: rook-ceph-cluster
valuesFrom:
- kind: ConfigMap
name: rook-ceph-cluster-1.12.3-d2iq-defaults
name: rook-ceph-cluster-1.12.1-d2iq-defaults
targetNamespace: ${releaseNamespace}
0 ...ter/1.12.3/helmrelease/kustomization.yaml → ...ter/1.12.1/helmrelease/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 ...ok-ceph-cluster/1.12.3/kustomization.yaml → ...ok-ceph-cluster/1.12.1/kustomization.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...-cluster/1.12.3/object-bucket-claims.yaml → ...-cluster/1.12.1/object-bucket-claims.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
wait: true
interval: 6h
retryInterval: 1m
path: ./services/rook-ceph-cluster/1.12.3/objectbucketclaims
path: ./services/rook-ceph-cluster/1.12.1/objectbucketclaims
sourceRef:
kind: GitRepository
name: management
Expand Down
2 changes: 1 addition & 1 deletion ....12.3/objectbucketclaims/helmrelease.yaml → ....12.1/objectbucketclaims/helmrelease.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
releaseName: object-bucket-claims
valuesFrom:
- kind: ConfigMap
name: rook-ceph-cluster-1.12.3-d2iq-defaults
name: rook-ceph-cluster-1.12.1-d2iq-defaults
- kind: ConfigMap
name: rook-ceph-cluster-overrides
optional: true
Expand Down
0 ...2.3/objectbucketclaims/kustomization.yaml → ...2.1/objectbucketclaims/kustomization.yaml
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...rook-ceph-cluster/1.12.3/pre-install.yaml → ...rook-ceph-cluster/1.12.1/pre-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: rook-ceph-cluster-prereq-jobs-v1.12.3
name: rook-ceph-cluster-prereq-jobs-v1.12.1
namespace: ${releaseNamespace}
spec:
force: true
prune: true
wait: true
interval: 6h
retryInterval: 1m
path: ./services/rook-ceph-cluster/1.12.3/pre-install
path: ./services/rook-ceph-cluster/1.12.1/pre-install
sourceRef:
kind: GitRepository
name: management
Expand All @@ -19,4 +19,4 @@ spec:
substitute:
releaseNamespace: ${releaseNamespace}
# Update the following version whenever ceph-cluster service is bumped.
desiredCephOperatorVersion: v1.12.3
desiredCephOperatorVersion: v1.12.1
0 ...er/1.12.3/pre-install/ceph-crd-check.yaml → ...er/1.12.1/pre-install/ceph-crd-check.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...eph-cluster/1.12.3/rook-ceph-cluster.yaml → ...eph-cluster/1.12.1/rook-ceph-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ metadata:
spec:
dependsOn:
# There can only be one operator per cluster, just ensure CRDs are present, no need to wait for actual operator Deployment.
- name: rook-ceph-cluster-prereq-jobs-v1.12.3
- name: rook-ceph-cluster-prereq-jobs-v1.12.1
namespace: ${workspaceNamespace}
force: false
prune: true
wait: true
interval: 6h
retryInterval: 1m
path: ./services/rook-ceph-cluster/1.12.3/helmrelease
path: ./services/rook-ceph-cluster/1.12.1/helmrelease
sourceRef:
kind: GitRepository
name: management
Expand Down
2 changes: 1 addition & 1 deletion services/rook-ceph/1.12.3/defaults/cm.yaml → services/rook-ceph/1.12.1/defaults/cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: rook-ceph-1.12.3-d2iq-defaults
name: rook-ceph-1.12.1-d2iq-defaults
namespace: ${releaseNamespace}
data:
values.yaml: |
Expand Down
0 ...k-ceph/1.12.3/defaults/kustomization.yaml → ...k-ceph/1.12.1/defaults/kustomization.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...-ceph/1.12.3/helmrelease/helmrelease.yaml → ...-ceph/1.12.1/helmrelease/helmrelease.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
kind: HelmRepository
name: charts.rook.io-release
namespace: kommander-flux
version: v1.12.3
version: v1.12.1
interval: 15s
install:
crds: CreateReplace
Expand All @@ -25,5 +25,5 @@ spec:
releaseName: rook-ceph
valuesFrom:
- kind: ConfigMap
name: rook-ceph-1.12.3-d2iq-defaults
name: rook-ceph-1.12.1-d2iq-defaults
targetNamespace: ${releaseNamespace}
0 ...eph/1.12.3/helmrelease/kustomization.yaml → ...eph/1.12.1/helmrelease/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 services/rook-ceph/1.12.3/kustomization.yaml → services/rook-ceph/1.12.1/kustomization.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion services/rook-ceph/1.12.3/rook-ceph.yaml → services/rook-ceph/1.12.1/rook-ceph.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
wait: true
interval: 6h
retryInterval: 1m
path: ./services/rook-ceph/1.12.3/helmrelease
path: ./services/rook-ceph/1.12.1/helmrelease
sourceRef:
kind: GitRepository
name: management
Expand Down
Loading