Skip to content

Commit

Permalink
Merge branch 'main' of github.com:mongodb/helm-charts into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
nammn committed Nov 20, 2023
2 parents 10e90c1 + b20a616 commit c719505
Show file tree
Hide file tree
Showing 14 changed files with 50 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/actions/releaser/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
version:
description: "The chart-releaser version to use (default: v1.2.1)"
required: false
default: v1.2.1
default: v1.6.0
charts_dir:
description: "The charts directory"
required: false
Expand Down
4 changes: 4 additions & 0 deletions .github/actions/releaser/cr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ release_charts_inside_folders() {
local folders=("$@")
local changed_charts=()

echo "fetch remote tags..."
git fetch --tags > /dev/null 2>&1

# form list of folder which was changed
for folder in "${folders[@]}"; do
[[ ! -f "$charts_dir/$folder/Chart.yaml" ]] && continue
Expand All @@ -54,6 +57,7 @@ release_charts_inside_folders() {

# continue only with changed charts
if [[ -n "${changed_charts[*]}" ]]; then
helm repo update
install_chart_releaser
cleanup_releaser
package_charts "${changed_charts[@]}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Configure Git
run: |
Expand All @@ -32,7 +32,7 @@ jobs:
- name: Install Helm
uses: azure/setup-helm@v1
with:
version: v3.4.0
version: v3.13.1

- name: Add Helm repos
run: |
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/post-atlas-operator-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,15 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Create and push branch
run: |
export VERSION=${{ github.event.inputs.version }}
export MAJOR_VERSION=$(cat operator/mongodb-atlas-kubernetes/major-version)
## Check that VERSION starts with MAJOR_VERSION
if [[ ${VERSION} == ${MAJOR_VERSION}.* ]]; then
echo "Version OK";
else
echo "Version mismatch: target version ${VERSION} doesn't match the Kubernetes Atlas Operator major version ${MAJOR_VERSION}.x.y";
exit 1
fi
cp helm/helm-charts/.github/actions/push-files/push-files.sh helm/helm-charts
cd helm/helm-charts
chmod +x push-files.sh
Expand Down
2 changes: 1 addition & 1 deletion charts/atlas-deployment/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ project:
# fullnameOverride: ""

projectIpAccessList:
- ipAddress: "0.0.0.0/1"
- ipAddress: "0.0.0.0"
comment: "REMOVE ME"

# include either deploymentSpec or advancedDeploymentSpec
Expand Down
4 changes: 2 additions & 2 deletions charts/atlas-operator-crds/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: mongodb-atlas-operator-crds
description: MongoDB Atlas Operator CRDs - Helm chart for installing and upgrading Custom Resource Definitions (CRDs) for the Atlas Operator.
type: application
version: 1.9.0
appVersion: 1.9.0
version: 1.9.1
appVersion: 1.9.1
kubeVersion: ">=1.15.0-0"
keywords:
- mongodb
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/instance: mongodb-atlas-kubernetes-operator
app.kubernetes.io/name: mongodb-atlas-kubernetes-operator
name: atlasfederatedauths.atlas.mongodb.com
spec:
group: atlas.mongodb.com
Expand Down Expand Up @@ -170,3 +173,9 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: null
storedVersions: null
6 changes: 3 additions & 3 deletions charts/atlas-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: mongodb-atlas-operator
description: |-
MongoDB Atlas Operator - a Helm chart for installing and upgrading Atlas Operator: the official Kubernetes operator allowing to manage MongoDB Atlas resources from Kubernetes
type: application
version: 1.9.0
appVersion: 1.9.0
version: 1.9.2
appVersion: 1.9.1
kubeVersion: ">=1.15.0-0"
keywords:
- mongodb
Expand All @@ -19,6 +19,6 @@ maintainers:
email: support@mongodb.com
dependencies:
- name: mongodb-atlas-operator-crds
version: "1.9.0"
version: "1.9.1"
repository: "https://mongodb.github.io/helm-charts"
condition: mongodb-atlas-operator-crds.enabled
2 changes: 1 addition & 1 deletion charts/enterprise-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: enterprise-operator
description: MongoDB Kubernetes Enterprise Operator
version: 1.22.0
version: 1.23.0
kubeVersion: '>=1.16-0'
type: application
keywords:
Expand Down
3 changes: 0 additions & 3 deletions charts/enterprise-operator/crds/mongodb.com_mongodb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,6 @@ spec:
credentials:
description: Name of the Secret holding credentials information
type: string
exposedExternally:
description: 'DEPRECATED: use ExternalAccessConfiguration instead'
type: boolean
externalAccess:
description: ExternalAccessConfiguration provides external access
configuration.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,6 @@ spec:
on one mapping with the service-account created in the central
cluster to talk to the workload clusters.
type: string
exposedExternally:
description: 'DEPRECATED: use ExternalAccessConfiguration instead'
type: boolean
externalAccess:
description: ExternalAccessConfiguration provides external access
configuration for Multi-Cluster.
Expand Down Expand Up @@ -323,9 +320,6 @@ spec:
default, if not specified the operator would create the duplicate
svc objects.'
type: boolean
exposedExternally:
description: 'DEPRECATED: use ExternalAccessConfiguration instead'
type: boolean
externalAccess:
description: ExternalAccessConfiguration provides external access
configuration.
Expand Down
6 changes: 2 additions & 4 deletions charts/enterprise-operator/crds/mongodb.com_opsmanagers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ spec:
name: v1
schema:
openAPIV3Schema:
description: The MongoDBOpsManager resource allows you to deploy Ops Manager
within your Kubernetes cluster
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand Down Expand Up @@ -217,10 +219,6 @@ spec:
have a one on one mapping with the service-account created
in the central cluster to talk to the workload clusters.
type: string
exposedExternally:
description: 'DEPRECATED: use ExternalAccessConfiguration
instead'
type: boolean
externalAccess:
description: ExternalAccessConfiguration provides external
access configuration for Multi-Cluster.
Expand Down
17 changes: 9 additions & 8 deletions charts/enterprise-operator/values-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ operator:
operator_image_name: mongodb-enterprise-operator-ubi

# Version of mongodb-enterprise-operator
version: 1.22.0
version: 1.23.0

# The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
watchedResources:
Expand All @@ -41,27 +41,27 @@ resources:
## Database
database:
name: mongodb-enterprise-database-ubi
version: 2.0.2
version: 1.23.0

initDatabase:
name: mongodb-enterprise-init-database-ubi
version: 1.0.19
version: 1.23.0

## Ops Manager
opsManager:
name: mongodb-enterprise-ops-manager-ubi

initOpsManager:
name: mongodb-enterprise-init-ops-manager-ubi
version: 1.0.12
version: 1.23.0

initAppDb:
name: mongodb-enterprise-init-appdb-ubi
version: 1.0.18
version: 1.23.0

agent:
name: mongodb-agent-ubi
version: 12.0.25.7724-1
version: 12.0.28.7763-1

mongodb:
name: mongodb-enterprise-server
Expand Down Expand Up @@ -130,6 +130,8 @@ relatedImages:
- 6.0.16
- 6.0.17
- 6.0.18
- 6.0.19
- 6.0.20
mongodb:
- 4.4.0-ubi8
- 4.4.1-ubi8
Expand Down Expand Up @@ -183,11 +185,10 @@ relatedImages:
- 11.12.0.7388-1
- 12.0.4.7554-1
- 12.0.15.7646-1
- 12.0.20.7686-1
- 12.0.21.7698-1
- 12.0.23.7711-1
- 12.0.24.7719-1
- 12.0.25.7724-1
- 12.0.28.7763-1
mongodbLegacyAppDb:
- 4.2.11-ent
- 4.2.2-ent
Expand Down
12 changes: 6 additions & 6 deletions charts/enterprise-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ operator:
deployment_name: mongodb-enterprise-operator

# Version of mongodb-enterprise-operator
version: 1.22.0
version: 1.23.0

# The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
watchedResources:
Expand Down Expand Up @@ -54,28 +54,28 @@ operator:
## Database
database:
name: mongodb-enterprise-database-ubi
version: 2.0.2
version: 1.23.0

initDatabase:
name: mongodb-enterprise-init-database-ubi
version: 1.0.19
version: 1.23.0

## Ops Manager
opsManager:
name: mongodb-enterprise-ops-manager-ubi

initOpsManager:
name: mongodb-enterprise-init-ops-manager-ubi
version: 1.0.12
version: 1.23.0

## Application Database
initAppDb:
name: mongodb-enterprise-init-appdb-ubi
version: 1.0.18
version: 1.23.0

agent:
name: mongodb-agent-ubi
version: 12.0.25.7724-1
version: 12.0.28.7763-1

mongodbLegacyAppDb:
name: mongodb-enterprise-appdb-database-ubi
Expand Down

0 comments on commit c719505

Please sign in to comment.