Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 4 additions & 8 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022-2024 the Kubeapps contributors.
# Copyright 2022-2025 the Kubeapps contributors.
# SPDX-License-Identifier: Apache-2.0

---
Expand All @@ -16,8 +16,6 @@ jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
# Known issue for go 1.18 support in codeql-go
# ref https://bytemeta.vip/repo/github/codeql-action/issues/1059?page=2
continue-on-error: true
permissions:
actions: read
Expand All @@ -28,8 +26,6 @@ jobs:
fail-fast: false
matrix:
language: ["go", "javascript"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
Expand All @@ -43,7 +39,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -55,7 +51,7 @@ jobs:

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
- name: Autobuild
uses: github/codeql-action/autobuild@v3
uses: github/codeql-action/autobuild@v4

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v4
53 changes: 0 additions & 53 deletions .github/workflows/kubeapps-custom-commit.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/kubeapps-general.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ env:
# DEBUG_MODE allows to activate some SSH debugging steps, and modify the verbosity level of some scripts (eg. e2e-tests.sh)
DEBUG_MODE: "false"
DOCKER_REGISTRY_VERSION: "3.0.0"
FLUX_VERSION: "v2.7.3"
FLUX_VERSION: "v2.2.3"
GITHUB_VERSION: "2.83.1"
GOLANG_VERSION: "1.25.4"
GOLANGCI_LINT_VERSION: "2.6.2"
Expand Down
3 changes: 2 additions & 1 deletion chart/kubeapps/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* [bitnami/*] Upgrade Helm stable version to v4.0.0
* [bitnami/*] Upgrade Chartmuseum to 3.10.4
* [bitnami/*] Upgrade kind to v0.30.0 with kubectl 1.33.4 => kubernetes version 1.33.4
* [bitnami/*] Upgrade flux to v2.7.3
* [bitnami/*] Upgrade golangci-lint to v2.6.2
* [bitnami/build] Upgrade docker registry version to 3.0.0
* [bitnami/build] Remove support for integration test on GKE
Expand All @@ -22,6 +21,8 @@
* [bitnami/pinniped] Upgrade rust to 1.91.1
* [bitnami/operator] Upgrade OLM to v0.38.0

**Info**: An upgrade to Flux v2.7 was tried but reverted. The effort is small but there are a few code changes which couldn't be done automatically. Contribution welcomed.

## 17.1.1 (2024-12-24)

* [bitnami/kubeapps] Release 17.1.1 ([#31153](https://github.com/bitnami/charts/pull/31153))
Expand Down
10 changes: 7 additions & 3 deletions script/e2e-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ TEST_TIMEOUT_MINUTES=${TEST_TIMEOUT_MINUTES:-"4"}
DEX_IP=${DEX_IP:-"172.18.0.2"}
ADDITIONAL_CLUSTER_IP=${ADDITIONAL_CLUSTER_IP:-"172.18.0.3"}
CHARTMUSEUM_VERSION=${CHARTMUSEUM_VERSION:-"3.10.4"}
FLUX_VERSION=${FLUX_VERSION:-"v2.7.3"}
FLUX_VERSION=${FLUX_VERSION:-"v2.2.3"}

# IMG_PREFIX default previously pointed to Docker Hub:
# IMG_PREFIX=${IMG_PREFIX:-"kubeapps/"}
Expand Down Expand Up @@ -70,7 +70,7 @@ fi
. "${ROOT_DIR}/script/lib/libutil.sh"

# Get the load balancer IP
LOAD_BALANCER_IP=$(kubectl -n nginx-ingress get service nginx-ingress-ingress-nginx-controller -o jsonpath="{.status.loadBalancer.ingress[].ip}")
LOAD_BALANCER_IP=$DEX_IP

# Functions for local Docker registry mgmt
. "${ROOT_DIR}/script/local-docker-registry.sh"
Expand Down Expand Up @@ -252,6 +252,10 @@ installFlux() {
k8s_wait_for_deployment ${namespace} helm-controller
k8s_wait_for_deployment ${namespace} source-controller

# Remove Flux NetworkPolicies (kind environment unreliable for NP-based isolation)
info "Removing Flux NetworkPolicies to avoid connectivity issues in kind"
kubectl get networkpolicy -n ${namespace} -o name | xargs -r kubectl delete -n ${namespace} || true

# Add test repository.
info "Install flux helm repository"
#kubectl apply -f https://raw.githubusercontent.com/fluxcd/source-controller/main/config/samples/source_v1_helmrepository.yaml
Expand Down Expand Up @@ -735,7 +739,7 @@ if [[ "${TESTS_GROUP}" == "${ALL_TESTS}" || "${TESTS_GROUP}" == "${OPERATOR_TEST
# re-installing postgres.
info "Installing latest Kubeapps chart available"
installOrUpgradeKubeapps "${ROOT_DIR}/chart/kubeapps" \
"--set" "packaging.helm.enabled=false" \
"--set" "packaging.helm.enabled=true" \
"--set" "featureFlags.operators=true"

info "Waiting for Kubeapps components to be ready (bitnami chart)..."
Expand Down
Loading