Skip to content

Commit

Permalink
Merge branch 'master' into solr-metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
pritamdas99 authored Mar 20, 2024
2 parents e6f621e + 414a57b commit e80ca3c
Show file tree
Hide file tree
Showing 573 changed files with 32,723 additions and 4,099 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
name: Build
runs-on: ubuntu-20.04
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v1
with:
go-version: '1.21'
go-version: '1.22'
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cve-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.21'
go-version: '1.22'

- name: Prepare git
env:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12
BASEIMAGE_DBG ?= debian:bookworm

GO_VERSION ?= 1.21
GO_VERSION ?= 1.22
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
CHART_TEST_IMAGE ?= quay.io/helmpack/chart-testing:v3.8.0

Expand Down
16 changes: 6 additions & 10 deletions apis/installer/v1alpha1/kubedb_webhook_server_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,12 @@ type KubedbWebhookServerSpec struct {
//+optional
NameOverride string `json:"nameOverride"`
//+optional
FullnameOverride string `json:"fullnameOverride"`
ReplicaCount int32 `json:"replicaCount"`
RegistryFQDN string `json:"registryFQDN"`
// +optional
License string `json:"license"`
// +optional
LicenseSecretName string `json:"licenseSecretName"`
Server Container `json:"server"`
FeatureGates map[string]bool `json:"featureGates"`
ImagePullPolicy string `json:"imagePullPolicy"`
FullnameOverride string `json:"fullnameOverride"`
ReplicaCount int32 `json:"replicaCount"`
RegistryFQDN string `json:"registryFQDN"`
Server Container `json:"server"`
FeatureGates map[string]bool `json:"featureGates"`
ImagePullPolicy string `json:"imagePullPolicy"`
//+optional
ImagePullSecrets []string `json:"imagePullSecrets"`
//+optional
Expand Down
284 changes: 142 additions & 142 deletions catalog/kubedb/README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/opensearch:1.1.0
distribution: OpenSearch
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:1.1.0-opensearch-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/opensearch:1.2.4
distribution: OpenSearch
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:1.2.4-opensearch-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/opensearch:1.3.13
distribution: OpenSearch
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:1.3.13-opensearch-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/opensearch:2.0.1
distribution: OpenSearch
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:2.0.1-opensearch-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/opensearch:2.11.1
distribution: OpenSearch
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:2.11.1-opensearch-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/opensearch:2.5.0
distribution: OpenSearch
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:2.5.0-opensearch-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/opensearch:2.8.0
distribution: OpenSearch
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:2.8.0-opensearch-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/elastic:6.8.23
distribution: ElasticStack
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:6.8.23-xpack-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/elastic:7.13.4
distribution: ElasticStack
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:7.13.4-xpack-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/elastic:7.14.2
distribution: ElasticStack
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:7.14.2-xpack-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/elastic:7.16.3
distribution: ElasticStack
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:7.16.3-xpack-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/elastic:7.17.15
distribution: ElasticStack
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:7.17.15-xpack-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
image: floragunncom/sg-elasticsearch:7.9.3-oss-47.1.0
distribution: SearchGuard
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:7.9.3-searchguard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/elastic:8.11.1
distribution: ElasticStack
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:8.11.1-xpack-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/elastic:8.2.3
distribution: ElasticStack
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:8.2.3-xpack-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/elastic:8.5.3
distribution: ElasticStack
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:8.5.3-xpack-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/elastic:8.6.2
distribution: ElasticStack
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:8.6.2-xpack-v2023.12.07
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
image: ghcr.io/appscode-images/elastic:8.8.2
distribution: ElasticStack
exporter:
image: prometheuscommunity/elasticsearch-exporter:v1.3.0
image: prometheuscommunity/elasticsearch-exporter:v1.7.0
initContainer:
image: tianon/toybox:0.8.4
yqImage: ghcr.io/kubedb/elasticsearch-init:8.8.2-xpack-v2023.12.07
Expand Down
2 changes: 1 addition & 1 deletion catalog/kubedb/raw/mariadb/deprecated-mariadb-10.10.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: 10.10.2
spec:
coordinator:
image: ghcr.io/kubedb/mariadb-coordinator:v0.23.0-rc.0
image: ghcr.io/kubedb/mariadb-coordinator:v0.24.0
db:
image: ghcr.io/appscode-images/mariadb:10.10.2-jammy
deprecated: true
Expand Down
2 changes: 1 addition & 1 deletion catalog/kubedb/raw/mariadb/deprecated-mariadb-10.11.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: 10.11.2
spec:
coordinator:
image: ghcr.io/kubedb/mariadb-coordinator:v0.23.0-rc.0
image: ghcr.io/kubedb/mariadb-coordinator:v0.24.0
db:
image: ghcr.io/appscode-images/mariadb:10.11.2-jammy
deprecated: true
Expand Down
2 changes: 1 addition & 1 deletion catalog/kubedb/raw/mariadb/deprecated-mariadb-10.4.17.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: 10.4.17
spec:
coordinator:
image: ghcr.io/kubedb/mariadb-coordinator:v0.23.0-rc.0
image: ghcr.io/kubedb/mariadb-coordinator:v0.24.0
db:
image: mariadb:10.4.17
deprecated: true
Expand Down
2 changes: 1 addition & 1 deletion catalog/kubedb/raw/mariadb/deprecated-mariadb-10.4.31.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: 10.4.31
spec:
coordinator:
image: ghcr.io/kubedb/mariadb-coordinator:v0.23.0-rc.0
image: ghcr.io/kubedb/mariadb-coordinator:v0.24.0
db:
image: ghcr.io/appscode-images/mariadb:10.4.31-focal
deprecated: true
Expand Down
2 changes: 1 addition & 1 deletion catalog/kubedb/raw/mariadb/deprecated-mariadb-10.5.8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: 10.5.8
spec:
coordinator:
image: ghcr.io/kubedb/mariadb-coordinator:v0.23.0-rc.0
image: ghcr.io/kubedb/mariadb-coordinator:v0.24.0
db:
image: mariadb:10.5.8
deprecated: true
Expand Down
2 changes: 1 addition & 1 deletion catalog/kubedb/raw/mariadb/deprecated-mariadb-10.6.4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: 10.6.4
spec:
coordinator:
image: ghcr.io/kubedb/mariadb-coordinator:v0.23.0-rc.0
image: ghcr.io/kubedb/mariadb-coordinator:v0.24.0
db:
image: ghcr.io/appscode-images/mariadb:10.6.4-focal
deprecated: true
Expand Down
14 changes: 13 additions & 1 deletion catalog/kubedb/raw/mariadb/mariadb-10.10.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,20 @@ kind: MariaDBVersion
metadata:
name: 10.10.7
spec:
archiver:
addon:
name: mariadb-addon
tasks:
manifestBackup:
name: manifest-backup
manifestRestore:
name: manifest-restore
volumeSnapshot:
name: volume-snapshot
walg:
image: ghcr.io/kubedb/mariadb-archiver:(v0.4.0)_10.10.7-jammy
coordinator:
image: ghcr.io/kubedb/mariadb-coordinator:v0.23.0-rc.0
image: ghcr.io/kubedb/mariadb-coordinator:v0.24.0
db:
image: ghcr.io/appscode-images/mariadb:10.10.7-jammy
exporter:
Expand Down
14 changes: 13 additions & 1 deletion catalog/kubedb/raw/mariadb/mariadb-10.11.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,20 @@ kind: MariaDBVersion
metadata:
name: 10.11.6
spec:
archiver:
addon:
name: mariadb-addon
tasks:
manifestBackup:
name: manifest-backup
manifestRestore:
name: manifest-restore
volumeSnapshot:
name: volume-snapshot
walg:
image: ghcr.io/kubedb/mariadb-archiver:(v0.4.0)_10.11.6-jammy
coordinator:
image: ghcr.io/kubedb/mariadb-coordinator:v0.23.0-rc.0
image: ghcr.io/kubedb/mariadb-coordinator:v0.24.0
db:
image: ghcr.io/appscode-images/mariadb:10.11.6-jammy
exporter:
Expand Down
14 changes: 13 additions & 1 deletion catalog/kubedb/raw/mariadb/mariadb-10.4.32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,20 @@ kind: MariaDBVersion
metadata:
name: 10.4.32
spec:
archiver:
addon:
name: mariadb-addon
tasks:
manifestBackup:
name: manifest-backup
manifestRestore:
name: manifest-restore
volumeSnapshot:
name: volume-snapshot
walg:
image: ghcr.io/kubedb/mariadb-archiver:(v0.4.0)_10.4.32-focal
coordinator:
image: ghcr.io/kubedb/mariadb-coordinator:v0.23.0-rc.0
image: ghcr.io/kubedb/mariadb-coordinator:v0.24.0
db:
image: ghcr.io/appscode-images/mariadb:10.4.32-focal
exporter:
Expand Down
14 changes: 13 additions & 1 deletion catalog/kubedb/raw/mariadb/mariadb-10.5.23.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,20 @@ kind: MariaDBVersion
metadata:
name: 10.5.23
spec:
archiver:
addon:
name: mariadb-addon
tasks:
manifestBackup:
name: manifest-backup
manifestRestore:
name: manifest-restore
volumeSnapshot:
name: volume-snapshot
walg:
image: ghcr.io/kubedb/mariadb-archiver:(v0.4.0)_10.5.23-focal
coordinator:
image: ghcr.io/kubedb/mariadb-coordinator:v0.23.0-rc.0
image: ghcr.io/kubedb/mariadb-coordinator:v0.24.0
db:
image: ghcr.io/appscode-images/mariadb:10.5.23-focal
exporter:
Expand Down
14 changes: 13 additions & 1 deletion catalog/kubedb/raw/mariadb/mariadb-10.6.16.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,20 @@ kind: MariaDBVersion
metadata:
name: 10.6.16
spec:
archiver:
addon:
name: mariadb-addon
tasks:
manifestBackup:
name: manifest-backup
manifestRestore:
name: manifest-restore
volumeSnapshot:
name: volume-snapshot
walg:
image: ghcr.io/kubedb/mariadb-archiver:(v0.4.0)_10.6.16-focal
coordinator:
image: ghcr.io/kubedb/mariadb-coordinator:v0.23.0-rc.0
image: ghcr.io/kubedb/mariadb-coordinator:v0.24.0
db:
image: ghcr.io/appscode-images/mariadb:10.6.16-focal
exporter:
Expand Down
Loading

0 comments on commit e80ca3c

Please sign in to comment.