Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/docker/build-push-…
Browse files Browse the repository at this point in the history
…action-6
  • Loading branch information
beni0888 authored Aug 6, 2024
2 parents b54a9cb + 2d1db8e commit d02468e
Show file tree
Hide file tree
Showing 107 changed files with 3,410 additions and 1,330 deletions.
37 changes: 17 additions & 20 deletions .github/workflows/kubeapps-general.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
default: false

env:
CHARTMUSEUM_VERSION: "3.10.2"
CHARTMUSEUM_VERSION: "3.10.3"
CHARTS_REPO_ORIGINAL: "bitnami/charts"
BRANCH_CHARTS_REPO_ORIGINAL: "main"
CHARTS_REPO_FORKED: "kubeapps-bot/charts"
Expand All @@ -35,10 +35,10 @@ env:
BRANCH_KUBEAPPS_REPO: "main"
README_GENERATOR_REPO: "bitnami-labs/readme-generator-for-helm"
DOCKER_REGISTRY_VERSION: "2.8.3"
GOLANG_VERSION: "1.22.2"
GOLANG_VERSION: "1.22.5"
HELM_VERSION_MIN: "v3.8.0"
HELM_VERSION_STABLE: "v3.14.3"
GITHUB_VERSION: "2.47.0"
HELM_VERSION_STABLE: "v3.15.3"
GITHUB_VERSION: "2.53.0"
IMAGES_TO_PUSH: "apprepository-controller dashboard asset-syncer pinniped-proxy kubeapps-apis oci-catalog"
# IMG_DEV_TAG is the tags used for the Kubeapps docker images. Ideally there should be an IMG_PROD_TAG
# but its value is dynamic and GitHub actions doesn't support it in the `env` block, so it is generated
Expand All @@ -51,18 +51,18 @@ env:
IMG_PREFIX_FOR_FORKS: "your-dockerhub-username/"
# Currently, we only build the images for linux/amd64 because building cross-platform images is extremely slow...
IMG_PLATFORMS: "linux/amd64"
KAPP_CONTROLLER_VERSION: "v0.50.2"
KAPP_CONTROLLER_VERSION: "v0.50.5"
FLUX_VERSION: "v2.2.3"
KIND_VERSION: "v0.22.0"
KIND_VERSION: "v0.23.0"
MKCERT_VERSION: "v1.4.4"
NODE_VERSION: "20.12.1"
OLM_VERSION: "v0.27.0"
POSTGRESQL_VERSION: "16.2.0-debian-12-r13"
RUST_VERSION: "1.77.1"
NODE_VERSION: "20.15.1"
OLM_VERSION: "v0.28.0"
POSTGRESQL_VERSION: "16.3.0-debian-12-r19"
RUST_VERSION: "1.79.0"
SEMVER_VERSION: "3.4.0"
K8S_KIND_VERSION: "v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843"
KUBECTL_VERSION: "v1.27.11"
GKE_REGULAR_VERSION: "1.27"
K8S_KIND_VERSION: "v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8"
KUBECTL_VERSION: "v1.29.7"
GKE_REGULAR_VERSION: "1.29"
GKE_STABLE_VERSION: "1.27"
GKE_ZONE: "us-east1-c"
GKE_PROJECT: "vmware-kubeapps-ci"
Expand Down Expand Up @@ -436,10 +436,12 @@ jobs:
tests_group:
- carvel
- flux
- main
- main-group-1
- main-group-2
- main-group-3
- multicluster
- multicluster-nokubeapps
- operator
- operators
env:
DEFAULT_DEX_IP: "172.18.0.2"
IMG_PREFIX: ${{ needs.setup.outputs.img_prefix }}
Expand Down Expand Up @@ -522,11 +524,6 @@ jobs:
- name: "Install multicluster deps"
run: |
./script/install-multicluster-deps.sh
# - name: Setup upterm session
# uses: lhotari/action-upterm@v1
# with:
# limit-access-to-actor: true
# limit-access-to-users: beni0888
- name: "Run e2e tests script"
run: ./script/run_e2e_tests.sh
- name: "Print k8s KubeappsAPIs logs if the tests fail"
Expand Down
16 changes: 2 additions & 14 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
# Kubeapps Maintainers

## Maintainers

| Maintainer | GitHub ID | Affiliation |
| ---------------------- | ----------------------------------------- | ---------------------------------------: |
| Antonio Gámez Díaz | [antgamdia](https://github.com/antgamdia) | [VMware](https://www.github.com/vmware/) |
| Carlos Sánchez Cazorla | [cscazorla](https://github.com/cscazorla) | [VMware](https://www.github.com/vmware/) |

## Emeritus Maintainers

- Adnan Abdulhussein ([prydonius](https://github.com/prydonius))
- Andrés Martínez Gotor ([andresmgot](https://github.com/andresmgot))
- Antonio Gámez Díaz ([antgamdia](https://github.com/antgamdia))
- Ara Pulido ([arapulido](https://github.com/arapulido))
- Carlos Sánchez Cazorla ([cscazorla](https://github.com/cscazorla))
- Dimitri Laloue ([dlaloue-vmware](https://github.com/dlaloue-vmware))
- Greg Fichtenholtz ([gfichtenholt](https://github.com/gfichtenholt))
- Jesús Benito ([beni0888](https://github.com/beni0888))
Expand All @@ -21,11 +16,4 @@
- Rafa Castelblanque ([castelblanque](https://github.com/castelblanque))
- Satya Dillikar ([satya-dillikar](https://github.com/satya-dillikar))

## Kubeapps Core Contributors & Stakeholders

| Feature Area | Lead |
| ------------------- | ------------------------------------------------------------------ |
| Technical Lead | Antonio Gámez Díaz ([antgamdia](https://github.com/antgamdia)) |
| Engineering Manager | Carlos Sánchez Cazorla ([cscazorla](https://github.com/cscazorla)) |

Full list of [Kubeapps contributors](https://github.com/vmware-tanzu/kubeapps/graphs/contributors).
4 changes: 3 additions & 1 deletion chart/kubeapps/.helmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2024 the Kubeapps contributors.
# Copyright 2021-2022 the Kubeapps contributors.
# SPDX-License-Identifier: Apache-2.0

# Patterns to ignore when building packages.
Expand All @@ -24,3 +24,5 @@
*.tmproj
# img folder
img/
# Changelog
CHANGELOG.md
Loading

0 comments on commit d02468e

Please sign in to comment.