Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	kube/manifests/next.yaml
  • Loading branch information
TropicalShadow committed Feb 6, 2024
2 parents a5821bf + dcd9edc commit 4701e49
Show file tree
Hide file tree
Showing 10 changed files with 372 additions and 392 deletions.
550 changes: 265 additions & 285 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ members = [
]

[workspace.package]
version = "1.0.11"
version = "1.0.12"
authors = ["Jérémy Levilain <[email protected]>"]
edition = "2021"
rust-version = "1.74.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

version = 1.0.11
version = 1.0.12
4 changes: 2 additions & 2 deletions kube/helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
type: application
version: '1.0.11'
appVersion: '1.0.11'
version: "1.0.12"
appVersion: "1.0.12"
name: shulker-operator
description: A Kubernetes operator for managing complex and dynamic Minecraft infrastructures.
home: https://shulker.jeremylvln.fr
Expand Down
2 changes: 1 addition & 1 deletion kube/helm/charts/shulker-addon-matchmaking/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
type: application
version: 0.0.0-internal
appVersion: '1.0.11'
appVersion: "1.0.12"
name: shulker-addon-matchmaking
64 changes: 32 additions & 32 deletions kube/manifests/next-with-prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-rbac
---
Expand All @@ -18,10 +18,10 @@ kind: ServiceAccount
metadata:
name: shulker-operator
labels:
helm.sh/chart: shulker-operator-1.0.11
helm.sh/chart: shulker-operator-1.0.12
app.kubernetes.io/name: shulker-operator
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-operator-rbac
---
Expand Down Expand Up @@ -5696,7 +5696,7 @@ metadata:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-rbac
rules:
Expand Down Expand Up @@ -5728,10 +5728,10 @@ kind: ClusterRole
metadata:
name: shulker-operator:workload
labels:
helm.sh/chart: shulker-operator-1.0.11
helm.sh/chart: shulker-operator-1.0.12
app.kubernetes.io/name: shulker-operator
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-operator-rbac
rules:
Expand Down Expand Up @@ -5796,7 +5796,7 @@ metadata:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-rbac
roleRef:
Expand All @@ -5815,10 +5815,10 @@ kind: ClusterRoleBinding
metadata:
name: shulker-operator:workload
labels:
helm.sh/chart: shulker-operator-1.0.11
helm.sh/chart: shulker-operator-1.0.12
app.kubernetes.io/name: shulker-operator
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-operator-rbac
roleRef:
Expand All @@ -5840,7 +5840,7 @@ metadata:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-rbac
rules:
Expand All @@ -5863,10 +5863,10 @@ kind: Role
metadata:
name: shulker-operator:leader-election
labels:
helm.sh/chart: shulker-operator-1.0.11
helm.sh/chart: shulker-operator-1.0.12
app.kubernetes.io/name: shulker-operator
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-operator-rbac
rules:
Expand All @@ -5892,7 +5892,7 @@ metadata:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-rbac
roleRef:
Expand All @@ -5911,10 +5911,10 @@ kind: RoleBinding
metadata:
name: shulker-operator:leader-election
labels:
helm.sh/chart: shulker-operator-1.0.11
helm.sh/chart: shulker-operator-1.0.12
app.kubernetes.io/name: shulker-operator
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-operator-rbac
roleRef:
Expand All @@ -5936,7 +5936,7 @@ metadata:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-director-metrics
spec:
Expand All @@ -5960,7 +5960,7 @@ metadata:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-mmf
spec:
Expand All @@ -5985,10 +5985,10 @@ kind: Service
metadata:
name: shulker-operator-metrics
labels:
helm.sh/chart: shulker-operator-1.0.11
helm.sh/chart: shulker-operator-1.0.12
app.kubernetes.io/name: shulker-operator
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-operator-metrics
spec:
Expand All @@ -6009,10 +6009,10 @@ kind: Service
metadata:
name: shulker-operator
labels:
helm.sh/chart: shulker-operator-1.0.11
helm.sh/chart: shulker-operator-1.0.12
app.kubernetes.io/name: shulker-operator
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-operator
spec:
Expand All @@ -6036,7 +6036,7 @@ metadata:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-director
spec:
Expand All @@ -6052,7 +6052,7 @@ spec:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-director
spec:
Expand Down Expand Up @@ -6135,7 +6135,7 @@ metadata:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-mmf
spec:
Expand All @@ -6151,7 +6151,7 @@ spec:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-mmf
spec:
Expand Down Expand Up @@ -6234,10 +6234,10 @@ kind: Deployment
metadata:
name: shulker-operator
labels:
helm.sh/chart: shulker-operator-1.0.11
helm.sh/chart: shulker-operator-1.0.12
app.kubernetes.io/name: shulker-operator
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-operator
spec:
Expand All @@ -6250,10 +6250,10 @@ spec:
template:
metadata:
labels:
helm.sh/chart: shulker-operator-1.0.11
helm.sh/chart: shulker-operator-1.0.12
app.kubernetes.io/name: shulker-operator
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-operator
spec:
Expand Down Expand Up @@ -6346,7 +6346,7 @@ metadata:
helm.sh/chart: shulker-addon-matchmaking-0.0.0-internal
app.kubernetes.io/name: shulker-addon-matchmaking
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-addon-matchmaking-director-metrics
prometheus: default
Expand All @@ -6370,10 +6370,10 @@ kind: ServiceMonitor
metadata:
name: shulker-operator
labels:
helm.sh/chart: shulker-operator-1.0.11
helm.sh/chart: shulker-operator-1.0.12
app.kubernetes.io/name: shulker-operator
app.kubernetes.io/instance: shulker-operator
app.kubernetes.io/version: "1.0.11"
app.kubernetes.io/version: "1.0.12"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: shulker-operator-metrics
prometheus: default
Expand Down
Loading

0 comments on commit 4701e49

Please sign in to comment.