Merge branch 'master' into fix-1014
This commit is contained in:
		
						commit
						a7026d09d2
					
				|  | @ -33,10 +33,7 @@ jobs: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     if: github.event_name == 'pull_request' || (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') |     if: github.event_name == 'pull_request' || (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') | ||||||
|     steps: |     steps: | ||||||
|       - uses: DeterminateSystems/nix-installer-action@ab6bcb2d5af0e904d04aea750e2089e9dc4cbfdd # v13 |       - uses: DeterminateSystems/nix-installer-action@e50d5f73bfe71c2dd0aa4218de8f4afa59f8f81d # v16 | ||||||
|         with: |  | ||||||
|           diagnostic-endpoint: "" |  | ||||||
|       - uses: DeterminateSystems/magic-nix-cache-action@b46e247b898aa56e6d2d2e728dc6df6c84fdb738 # v7 |  | ||||||
|         with: |         with: | ||||||
|           diagnostic-endpoint: "" |           diagnostic-endpoint: "" | ||||||
|       - name: Checkout code |       - name: Checkout code | ||||||
|  | @ -54,7 +51,7 @@ jobs: | ||||||
|           | sed -e 's/\(.*\)/"\1"/' | xargs sed -i "/date:/c\date: $(date +'%Y-%m-%d')" |           | sed -e 's/\(.*\)/"\1"/' | xargs sed -i "/date:/c\date: $(date +'%Y-%m-%d')" | ||||||
| 
 | 
 | ||||||
|       - name: Create Pull Request |       - name: Create Pull Request | ||||||
|         uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6 |         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v6 | ||||||
|         if: env.IS_CHANGED == 'true' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') |         if: env.IS_CHANGED == 'true' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') | ||||||
|         with: |         with: | ||||||
|           commit-message: Auto-updated docs |           commit-message: Auto-updated docs | ||||||
|  | @ -68,10 +65,7 @@ jobs: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     if: github.event_name == 'pull_request' || (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') |     if: github.event_name == 'pull_request' || (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') | ||||||
|     steps: |     steps: | ||||||
|       - uses: DeterminateSystems/nix-installer-action@ab6bcb2d5af0e904d04aea750e2089e9dc4cbfdd # v13 |       - uses: DeterminateSystems/nix-installer-action@e50d5f73bfe71c2dd0aa4218de8f4afa59f8f81d # v16 | ||||||
|         with: |  | ||||||
|           diagnostic-endpoint: "" |  | ||||||
|       - uses: DeterminateSystems/magic-nix-cache-action@b46e247b898aa56e6d2d2e728dc6df6c84fdb738 # v7 |  | ||||||
|         with: |         with: | ||||||
|           diagnostic-endpoint: "" |           diagnostic-endpoint: "" | ||||||
|       - name: Checkout code |       - name: Checkout code | ||||||
|  |  | ||||||
|  | @ -51,7 +51,7 @@ jobs: | ||||||
|           cp chart/jenkins-operator/crds/jenkins-crd.yaml deploy/crds/jenkins.io_jenkins_crd.yaml |           cp chart/jenkins-operator/crds/jenkins-crd.yaml deploy/crds/jenkins.io_jenkins_crd.yaml | ||||||
| 
 | 
 | ||||||
|       - name: Create Pull Request |       - name: Create Pull Request | ||||||
|         uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6 |         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v6 | ||||||
|         with: |         with: | ||||||
|           commit-message: Auto-updated Kubernetes Manifests |           commit-message: Auto-updated Kubernetes Manifests | ||||||
|           branch: manifest-deploy-update |           branch: manifest-deploy-update | ||||||
|  |  | ||||||
|  | @ -19,12 +19,15 @@ on: | ||||||
|       - 'backup/**' |       - 'backup/**' | ||||||
|       - '*.md' |       - '*.md' | ||||||
| 
 | 
 | ||||||
| #TODO: create a matrix per earch bats file |  | ||||||
| jobs: | jobs: | ||||||
|   run-tests: |   run-tests: | ||||||
|     if: github.event.pull_request.draft == false |     if: github.event.pull_request.draft == false | ||||||
|     name: BATS Run tests |     name: BATS test ${{ matrix.test-file }} | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|  |     strategy: | ||||||
|  |       fail-fast: false | ||||||
|  |       matrix: | ||||||
|  |         test-file: ["1-deploy", "2-deploy-with-more-options", "3-deploy-with-webhook"] | ||||||
|     steps: |     steps: | ||||||
|       - name: Check out code |       - name: Check out code | ||||||
|         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 |         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 | ||||||
|  | @ -46,7 +49,7 @@ jobs: | ||||||
|         run: make go-dependencies |         run: make go-dependencies | ||||||
| 
 | 
 | ||||||
|       - name: Setup Bats and libs |       - name: Setup Bats and libs | ||||||
|         uses: bats-core/bats-action@e424f8b8f722bf06a64acb1e10d8c437cd4170e6 # 2.0.0 |         uses: bats-core/bats-action@e412797c46257a2dbf3775f6f6010b33ee6cb99f # 3.0.1 | ||||||
|         with: |         with: | ||||||
|           support-path: "${{ github.workspace }}/.bats/bats-support" |           support-path: "${{ github.workspace }}/.bats/bats-support" | ||||||
|           assert-path: "${{ github.workspace }}/.bats/bats-assert" |           assert-path: "${{ github.workspace }}/.bats/bats-assert" | ||||||
|  | @ -54,11 +57,11 @@ jobs: | ||||||
|           file-path: "${{ github.workspace }}/.bats/bats-file" |           file-path: "${{ github.workspace }}/.bats/bats-file" | ||||||
| 
 | 
 | ||||||
|       - name: Kind setup |       - name: Kind setup | ||||||
|         uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0 |         uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 | ||||||
|         with: |         with: | ||||||
|           cluster_name: ${{env.KIND_CLUSTER_NAME}} |           cluster_name: ${{env.KIND_CLUSTER_NAME}} | ||||||
| 
 | 
 | ||||||
|       - name: Jenkins Operator - bats tests |       - name: Jenkins Operator - bats tests | ||||||
|         env: |         env: | ||||||
|           BATS_LIB_PATH: "${{ github.workspace }}/.bats" |           BATS_LIB_PATH: "${{ github.workspace }}/.bats" | ||||||
|         run: make bats-tests |         run: BATS_TEST_PATH=${{matrix.test-file}}.bats make bats-tests | ||||||
|  |  | ||||||
|  | @ -84,7 +84,7 @@ jobs: | ||||||
|         run: make go-dependencies |         run: make go-dependencies | ||||||
| 
 | 
 | ||||||
|       - name: Kind setup |       - name: Kind setup | ||||||
|         uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0 |         uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 | ||||||
|         with: |         with: | ||||||
|           cluster_name: ${{env.KIND_CLUSTER_NAME}} |           cluster_name: ${{env.KIND_CLUSTER_NAME}} | ||||||
|           config: kind-cluster.yaml |           config: kind-cluster.yaml | ||||||
|  |  | ||||||
|  | @ -85,7 +85,7 @@ jobs: | ||||||
|         run: make go-dependencies |         run: make go-dependencies | ||||||
| 
 | 
 | ||||||
|       - name: Kind setup |       - name: Kind setup | ||||||
|         uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0 |         uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 | ||||||
|         with: |         with: | ||||||
|           cluster_name: ${{env.KIND_CLUSTER_NAME}} |           cluster_name: ${{env.KIND_CLUSTER_NAME}} | ||||||
|           config: kind-cluster.yaml |           config: kind-cluster.yaml | ||||||
|  |  | ||||||
|  | @ -31,7 +31,7 @@ jobs: | ||||||
| 
 | 
 | ||||||
|       # Creates pull request with new chart version |       # Creates pull request with new chart version | ||||||
|       - name: Create Pull Request |       - name: Create Pull Request | ||||||
|         uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6 |         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v6 | ||||||
|         with: |         with: | ||||||
|           commit-message: Release Helm chart ${{ github.event.inputs.chartVersion }} |           commit-message: Release Helm chart ${{ github.event.inputs.chartVersion }} | ||||||
|           branch: helm-chart-release-${{ github.event.inputs.chartVersion }} |           branch: helm-chart-release-${{ github.event.inputs.chartVersion }} | ||||||
|  |  | ||||||
|  | @ -26,7 +26,7 @@ jobs: | ||||||
| 
 | 
 | ||||||
|       - name: Prep - setup Bats and bats libs |       - name: Prep - setup Bats and bats libs | ||||||
|         if: ${{ github.event.inputs.skipTests != 'true' }} |         if: ${{ github.event.inputs.skipTests != 'true' }} | ||||||
|         uses: bats-core/bats-action@e424f8b8f722bf06a64acb1e10d8c437cd4170e6 # 2.0.0 |         uses: bats-core/bats-action@472edde1138d59aca53ff162fb8d996666d21e4a # 2.0.0 | ||||||
|         with: |         with: | ||||||
|           support-path: "${{ github.workspace }}/.bats/bats-support" |           support-path: "${{ github.workspace }}/.bats/bats-support" | ||||||
|           assert-path: "${{ github.workspace }}/.bats/bats-assert" |           assert-path: "${{ github.workspace }}/.bats/bats-assert" | ||||||
|  | @ -54,7 +54,7 @@ jobs: | ||||||
| 
 | 
 | ||||||
|       - name: Prep - Kind setup |       - name: Prep - Kind setup | ||||||
|         if: ${{ github.event.inputs.skipTests != 'true' }} |         if: ${{ github.event.inputs.skipTests != 'true' }} | ||||||
|         uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0 |         uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0 | ||||||
|         with: |         with: | ||||||
|           cluster_name: ${{env.KIND_CLUSTER_NAME}} |           cluster_name: ${{env.KIND_CLUSTER_NAME}} | ||||||
|           config: kind-cluster.yaml |           config: kind-cluster.yaml | ||||||
|  |  | ||||||
							
								
								
									
										14
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										14
									
								
								Makefile
								
								
								
								
							|  | @ -93,11 +93,17 @@ test: ## Runs the go tests | ||||||
| 	@RUNNING_TESTS=1 go test -tags "$(BUILDTAGS) cgo" $(PACKAGES_FOR_UNIT_TESTS) | 	@RUNNING_TESTS=1 go test -tags "$(BUILDTAGS) cgo" $(PACKAGES_FOR_UNIT_TESTS) | ||||||
| 
 | 
 | ||||||
| .PHONY: e2e | .PHONY: e2e | ||||||
| e2e: deepcopy-gen manifests backup-kind-load ## Runs e2e tests, you can use EXTRA_ARGS
 | e2e: deepcopy-gen manifests backup-kind-load jenkins-kind-load ## Runs e2e tests, you can use EXTRA_ARGS
 | ||||||
| 	@echo "+ $@" | 	@echo "+ $@" | ||||||
| 	RUNNING_TESTS=1 go test -parallel=1 "./test/e2e/" -ginkgo.v -tags "$(BUILDTAGS) cgo" -v -timeout 60m -run "$(E2E_TEST_SELECTOR)" \
 | 	RUNNING_TESTS=1 go test -parallel=1 "./test/e2e/" -ginkgo.v -tags "$(BUILDTAGS) cgo" -v -timeout 60m -run "$(E2E_TEST_SELECTOR)" \
 | ||||||
| 		-jenkins-api-hostname=$(JENKINS_API_HOSTNAME) -jenkins-api-port=$(JENKINS_API_PORT) -jenkins-api-use-nodeport=$(JENKINS_API_USE_NODEPORT) $(E2E_TEST_ARGS) | 		-jenkins-api-hostname=$(JENKINS_API_HOSTNAME) -jenkins-api-port=$(JENKINS_API_PORT) -jenkins-api-use-nodeport=$(JENKINS_API_USE_NODEPORT) $(E2E_TEST_ARGS) | ||||||
| 
 | 
 | ||||||
|  | .PHONY: jenkins-kind-load | ||||||
|  | jenkins-kind-load: ## Load the jenkins lts version in kind to speed up tests
 | ||||||
|  | 	@echo "+ $@" | ||||||
|  | 	docker pull jenkins/jenkins:$(LATEST_LTS_VERSION) | ||||||
|  | 	kind load docker-image jenkins/jenkins:$(LATEST_LTS_VERSION) --name $(KIND_CLUSTER_NAME) | ||||||
|  | 
 | ||||||
| ## Backup Section
 | ## Backup Section
 | ||||||
| 
 | 
 | ||||||
| .PHONY: backup-kind-load | .PHONY: backup-kind-load | ||||||
|  | @ -386,18 +392,18 @@ kind-clean: ## Delete kind cluster | ||||||
| kind-revamp: kind-clean kind-setup ## Delete and recreate kind cluster
 | kind-revamp: kind-clean kind-setup ## Delete and recreate kind cluster
 | ||||||
| 	@echo "+ $@" | 	@echo "+ $@" | ||||||
| 
 | 
 | ||||||
| .PHONY: bats-tests | .PHONY: bats-tests ## Run bats tests
 | ||||||
| IMAGE_NAME := quay.io/$(QUAY_ORGANIZATION)/$(QUAY_REGISTRY):$(GITCOMMIT)-amd64 | IMAGE_NAME := quay.io/$(QUAY_ORGANIZATION)/$(QUAY_REGISTRY):$(GITCOMMIT)-amd64 | ||||||
| BUILD_PRESENT := $(shell docker images |grep -q ${IMAGE_NAME}) | BUILD_PRESENT := $(shell docker images |grep -q ${IMAGE_NAME}) | ||||||
| ifndef BUILD_PRESENT | ifndef BUILD_PRESENT | ||||||
| bats-tests: backup-kind-load container-runtime-build-amd64 ## Run bats tests
 | bats-tests: backup-kind-load container-runtime-build-amd64 ## Run bats tests
 | ||||||
| 	@echo "+ $@" | 	@echo "+ $@" | ||||||
| 	kind load docker-image ${IMAGE_NAME} --name $(KIND_CLUSTER_NAME) | 	kind load docker-image ${IMAGE_NAME} --name $(KIND_CLUSTER_NAME) | ||||||
| 	OPERATOR_IMAGE="${IMAGE_NAME}" TERM=xterm bats -T -p test/bats | 	OPERATOR_IMAGE="${IMAGE_NAME}" TERM=xterm bats -T -p test/bats$(if $(BATS_TEST_PATH),/${BATS_TEST_PATH}) | ||||||
| else | else | ||||||
| bats-tests: backup-kind-load | bats-tests: backup-kind-load | ||||||
| 	@echo "+ $@" | 	@echo "+ $@" | ||||||
| 	OPERATOR_IMAGE="${IMAGE_NAME}" TERM=xterm bats -T -p test/bats | 	OPERATOR_IMAGE="${IMAGE_NAME}" TERM=xterm bats -T -p test/bats$(if $(BATS_TEST_PATH),/${BATS_TEST_PATH}) | ||||||
| endif | endif | ||||||
| 
 | 
 | ||||||
| .PHONY: crc-start | .PHONY: crc-start | ||||||
|  |  | ||||||
|  | @ -54,11 +54,12 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes | ||||||
| | jenkins.enabled | bool | `true` |  | | | jenkins.enabled | bool | `true` |  | | ||||||
| | jenkins.env | list | `[]` |  | | | jenkins.env | list | `[]` |  | | ||||||
| | jenkins.hostAliases | object | `{}` |  | | | jenkins.hostAliases | object | `{}` |  | | ||||||
| | jenkins.image | string | `"jenkins/jenkins:2.479.2-lts"` |  | | | jenkins.image | string | `"jenkins/jenkins:2.492.3-lts"` |  | | ||||||
| | jenkins.imagePullPolicy | string | `"Always"` |  | | | jenkins.imagePullPolicy | string | `"Always"` |  | | ||||||
| | jenkins.imagePullSecrets | list | `[]` |  | | | jenkins.imagePullSecrets | list | `[]` |  | | ||||||
| | jenkins.labels | object | `{}` |  | | | jenkins.labels | object | `{}` |  | | ||||||
| | jenkins.latestPlugins | bool | `true` |  | | | jenkins.latestPlugins | bool | `true` |  | | ||||||
|  | | jenkins.lifecycle | object | `{}` |  | | ||||||
| | jenkins.livenessProbe.failureThreshold | int | `20` |  | | | jenkins.livenessProbe.failureThreshold | int | `20` |  | | ||||||
| | jenkins.livenessProbe.httpGet.path | string | `"/login"` |  | | | jenkins.livenessProbe.httpGet.path | string | `"/login"` |  | | ||||||
| | jenkins.livenessProbe.httpGet.port | string | `"http"` |  | | | jenkins.livenessProbe.httpGet.port | string | `"http"` |  | | ||||||
|  | @ -113,4 +114,4 @@ Kubernetes native operator which fully manages Jenkins on Kubernetes | ||||||
| | webhook.enabled | bool | `false` |  | | | webhook.enabled | bool | `false` |  | | ||||||
| 
 | 
 | ||||||
| ---------------------------------------------- | ---------------------------------------------- | ||||||
| Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) | Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) | ||||||
|  |  | ||||||
|  | @ -36,7 +36,7 @@ jenkins: | ||||||
|   # image is the name (and tag) of the Jenkins instance |   # image is the name (and tag) of the Jenkins instance | ||||||
|   # Default: jenkins/jenkins:lts |   # Default: jenkins/jenkins:lts | ||||||
|   # It's recommended to use LTS (tag: "lts") version |   # It's recommended to use LTS (tag: "lts") version | ||||||
|   image: jenkins/jenkins:2.479.2-lts |   image: jenkins/jenkins:2.492.3-lts | ||||||
| 
 | 
 | ||||||
|   # env contains jenkins container environment variables |   # env contains jenkins container environment variables | ||||||
|   env: [] |   env: [] | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ GO_VERSION="1.22" | ||||||
| HELM_VERSION="3.12.3" | HELM_VERSION="3.12.3" | ||||||
| IMAGE_PULL_MODE="local" | IMAGE_PULL_MODE="local" | ||||||
| KIND_CLUSTER_NAME="jenkins" | KIND_CLUSTER_NAME="jenkins" | ||||||
| LATEST_LTS_VERSION="2.479.2" | LATEST_LTS_VERSION="2.492.3" | ||||||
| NAME="kubernetes-operator" | NAME="kubernetes-operator" | ||||||
| NAMESPACE="default" | NAMESPACE="default" | ||||||
| OPERATOR_SDK_VERSION="1.35.0" | OPERATOR_SDK_VERSION="1.35.0" | ||||||
|  |  | ||||||
							
								
								
									
										10
									
								
								go.mod
								
								
								
								
							
							
						
						
									
										10
									
								
								go.mod
								
								
								
								
							|  | @ -15,7 +15,7 @@ require ( | ||||||
| 	github.com/pkg/errors v0.9.1 | 	github.com/pkg/errors v0.9.1 | ||||||
| 	github.com/stretchr/testify v1.9.0 | 	github.com/stretchr/testify v1.9.0 | ||||||
| 	go.uber.org/zap v1.27.0 | 	go.uber.org/zap v1.27.0 | ||||||
| 	golang.org/x/crypto v0.25.0 | 	golang.org/x/crypto v0.31.0 | ||||||
| 	golang.org/x/mod v0.19.0 | 	golang.org/x/mod v0.19.0 | ||||||
| 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df | 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df | ||||||
| 	k8s.io/api v0.30.3 | 	k8s.io/api v0.30.3 | ||||||
|  | @ -82,10 +82,10 @@ require ( | ||||||
| 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect | 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect | ||||||
| 	golang.org/x/net v0.27.0 // indirect | 	golang.org/x/net v0.27.0 // indirect | ||||||
| 	golang.org/x/oauth2 v0.21.0 // indirect | 	golang.org/x/oauth2 v0.21.0 // indirect | ||||||
| 	golang.org/x/sync v0.7.0 // indirect | 	golang.org/x/sync v0.10.0 // indirect | ||||||
| 	golang.org/x/sys v0.22.0 // indirect | 	golang.org/x/sys v0.28.0 // indirect | ||||||
| 	golang.org/x/term v0.22.0 // indirect | 	golang.org/x/term v0.27.0 // indirect | ||||||
| 	golang.org/x/text v0.16.0 // indirect | 	golang.org/x/text v0.21.0 // indirect | ||||||
| 	golang.org/x/time v0.5.0 // indirect | 	golang.org/x/time v0.5.0 // indirect | ||||||
| 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect | 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect | ||||||
| 	google.golang.org/protobuf v1.34.2 // indirect | 	google.golang.org/protobuf v1.34.2 // indirect | ||||||
|  |  | ||||||
							
								
								
									
										20
									
								
								go.sum
								
								
								
								
							
							
						
						
									
										20
									
								
								go.sum
								
								
								
								
							|  | @ -195,8 +195,8 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= | ||||||
| golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||||||
| golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||||||
| golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||||||
| golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= | golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= | ||||||
| golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= | golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= | ||||||
| golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= | golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= | ||||||
| golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= | golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= | ||||||
| golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | ||||||
|  | @ -221,8 +221,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ | ||||||
| golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
| golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
| golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||||
| golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= | golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= | ||||||
| golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= | golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= | ||||||
| golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||||
| golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||||
| golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||||
|  | @ -237,16 +237,16 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w | ||||||
| golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||||
| golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= | golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= | ||||||
| golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||||||
| golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | ||||||
| golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= | golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= | ||||||
| golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= | golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= | ||||||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||||||
| golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | ||||||
| golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||||
| golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= | golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= | ||||||
| golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= | golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= | ||||||
| golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= | golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= | ||||||
| golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= | golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= | ||||||
| golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||||
|  |  | ||||||
|  | @ -1,5 +1,7 @@ | ||||||
| apiVersion: kind.x-k8s.io/v1alpha4 | apiVersion: kind.x-k8s.io/v1alpha4 | ||||||
| kind: Cluster | kind: Cluster | ||||||
|  | networking: | ||||||
|  |   dnsSearch: [] | ||||||
| nodes: | nodes: | ||||||
| - role: control-plane | - role: control-plane | ||||||
|   extraPortMappings: |   extraPortMappings: | ||||||
|  |  | ||||||
|  | @ -194,8 +194,8 @@ schema = 3 | ||||||
|     version = "v1.27.0" |     version = "v1.27.0" | ||||||
|     hash = "sha256-8655KDrulc4Das3VRduO9MjCn8ZYD5WkULjCvruaYsU=" |     hash = "sha256-8655KDrulc4Das3VRduO9MjCn8ZYD5WkULjCvruaYsU=" | ||||||
|   [mod."golang.org/x/crypto"] |   [mod."golang.org/x/crypto"] | ||||||
|     version = "v0.25.0" |     version = "v0.31.0" | ||||||
|     hash = "sha256-traLAylqoBwGIh0Z1fuEhNjbGgQBItgVjtZYdYr0zzQ=" |     hash = "sha256-ZBjoG7ZOuTEmjaXPP9txAvjAjC46DeaLs0zrNzi8EQw=" | ||||||
|   [mod."golang.org/x/exp"] |   [mod."golang.org/x/exp"] | ||||||
|     version = "v0.0.0-20240719175910-8a7402abbf56" |     version = "v0.0.0-20240719175910-8a7402abbf56" | ||||||
|     hash = "sha256-mHEPy0vbd/pFwq5ZAEKaehCeYVQLEFDGnXAoVgkCLPo=" |     hash = "sha256-mHEPy0vbd/pFwq5ZAEKaehCeYVQLEFDGnXAoVgkCLPo=" | ||||||
|  | @ -209,17 +209,17 @@ schema = 3 | ||||||
|     version = "v0.21.0" |     version = "v0.21.0" | ||||||
|     hash = "sha256-0xgi5k7fxMScMH+rDwXhDqe8raTFHh5ih727jGVS918=" |     hash = "sha256-0xgi5k7fxMScMH+rDwXhDqe8raTFHh5ih727jGVS918=" | ||||||
|   [mod."golang.org/x/sync"] |   [mod."golang.org/x/sync"] | ||||||
|     version = "v0.7.0" |     version = "v0.10.0" | ||||||
|     hash = "sha256-2ETllEu2GDWoOd/yMkOkLC2hWBpKzbVZ8LhjLu0d2A8=" |     hash = "sha256-HWruKClrdoBKVdxKCyoazxeQV4dIYLdkHekQvx275/o=" | ||||||
|   [mod."golang.org/x/sys"] |   [mod."golang.org/x/sys"] | ||||||
|     version = "v0.22.0" |     version = "v0.28.0" | ||||||
|     hash = "sha256-RbG0XaXGGlErCsl2agvUxMnrkRwdbJLmriYT1H24FwA=" |     hash = "sha256-kzSlDo5FKsQU9cLefIt2dueGUfz9XuEW+mGSGlPATGc=" | ||||||
|   [mod."golang.org/x/term"] |   [mod."golang.org/x/term"] | ||||||
|     version = "v0.22.0" |     version = "v0.27.0" | ||||||
|     hash = "sha256-tRx/y4ZIZzGAlDJ/8JW3AycC9bRXlNuRqO4V48sAEEc=" |     hash = "sha256-cb5p/yOlVL7dbkxugUVfqESTVpZ2LtrUWPnx9yue3r0=" | ||||||
|   [mod."golang.org/x/text"] |   [mod."golang.org/x/text"] | ||||||
|     version = "v0.16.0" |     version = "v0.21.0" | ||||||
|     hash = "sha256-hMTO45upjEuA4sJzGplJT+La2n3oAfHccfYWZuHcH+8=" |     hash = "sha256-QaMwddBRnoS2mv9Y86eVC2x2wx/GZ7kr2zAJvwDeCPc=" | ||||||
|   [mod."golang.org/x/time"] |   [mod."golang.org/x/time"] | ||||||
|     version = "v0.5.0" |     version = "v0.5.0" | ||||||
|     hash = "sha256-W6RgwgdYTO3byIPOFxrP2IpAZdgaGowAaVfYby7AULU=" |     hash = "sha256-W6RgwgdYTO3byIPOFxrP2IpAZdgaGowAaVfYby7AULU=" | ||||||
|  |  | ||||||
|  | @ -14,7 +14,7 @@ pkgs.buildNpmPackage { | ||||||
|   name = "jenkins-kubernetes-operator-website"; |   name = "jenkins-kubernetes-operator-website"; | ||||||
|   src = ../website; |   src = ../website; | ||||||
|   version = "0.0.2"; |   version = "0.0.2"; | ||||||
|   npmDepsHash = "sha256-VrHuyqTPUzVJSjah+BWfg7R9yiarJQ2MDvEdqkOWddM="; |   npmDepsHash = "sha256-OSUhPFmrwhSVYzxPW7AocSngdIak4bxKSwobF8UfB0g="; | ||||||
|   nativeBuildInputs = buildPackages; |   nativeBuildInputs = buildPackages; | ||||||
|   buildPhase = "${pkgs.nodejs_22}/bin/npm run build"; |   buildPhase = "${pkgs.nodejs_22}/bin/npm run build"; | ||||||
|   installPhase = "cp -r public $out"; |   installPhase = "cp -r public $out"; | ||||||
|  |  | ||||||
|  | @ -8,7 +8,7 @@ const ( | ||||||
| 	// SeedJobSuffix is a suffix added for all seed jobs
 | 	// SeedJobSuffix is a suffix added for all seed jobs
 | ||||||
| 	SeedJobSuffix = "job-dsl-seed" | 	SeedJobSuffix = "job-dsl-seed" | ||||||
| 	// DefaultJenkinsMasterImage is the default Jenkins master docker image
 | 	// DefaultJenkinsMasterImage is the default Jenkins master docker image
 | ||||||
| 	DefaultJenkinsMasterImage = "jenkins/jenkins:2.479.2-lts" | 	DefaultJenkinsMasterImage = "jenkins/jenkins:2.492.3-lts" | ||||||
| 	// DefaultHTTPPortInt32 is the default Jenkins HTTP port
 | 	// DefaultHTTPPortInt32 is the default Jenkins HTTP port
 | ||||||
| 	DefaultHTTPPortInt32 = int32(8080) | 	DefaultHTTPPortInt32 = int32(8080) | ||||||
| 	// DefaultSlavePortInt32 is the default Jenkins port for slaves
 | 	// DefaultSlavePortInt32 is the default Jenkins port for slaves
 | ||||||
|  |  | ||||||
|  | @ -33,7 +33,7 @@ diag() { | ||||||
|     --set namespace=${DETIK_CLIENT_NAMESPACE} \ |     --set namespace=${DETIK_CLIENT_NAMESPACE} \ | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.479.2-lts" \ |     --set jenkins.image="jenkins/jenkins:2.492.3-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=false \ |     --set jenkins.backup.makeBackupBeforePodDeletion=false \ | ||||||
|     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ |     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ | ||||||
|  | @ -68,8 +68,12 @@ diag() { | ||||||
|   run try "at most 20 times every 10s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"jenkins-master\")].ready' is 'true'" |   run try "at most 20 times every 10s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"jenkins-master\")].ready' is 'true'" | ||||||
|   assert_success |   assert_success | ||||||
| 
 | 
 | ||||||
|   run try "at most 20 times every 5s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"jenkins-master\")].ready' is 'true'" |   run try "at most 20 times every 5s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"backup\")].ready' is 'true'" | ||||||
|   assert_success |   assert_success | ||||||
|  | 
 | ||||||
|  |   run ${KUBECTL} logs -l jenkins-cr=jenkins --tail=-1 | ||||||
|  |   assert_success | ||||||
|  |   assert_output --partial 'Jenkins is fully up and running' | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #bats test_tags=phase:helm,scenario:vanilla | #bats test_tags=phase:helm,scenario:vanilla | ||||||
|  | @ -154,13 +158,16 @@ diag() { | ||||||
|     --set namespace=${DETIK_CLIENT_NAMESPACE} \ |     --set namespace=${DETIK_CLIENT_NAMESPACE} \ | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.479.2-lts" \ |     --set jenkins.image="jenkins/jenkins:2.492.3-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=false \ |     --set jenkins.backup.makeBackupBeforePodDeletion=false \ | ||||||
|     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ |     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ | ||||||
|     chart/jenkins-operator --wait |     chart/jenkins-operator --wait | ||||||
|   assert_success |   assert_success | ||||||
|   assert ${HELM} status default |   assert ${HELM} status default | ||||||
|  | 
 | ||||||
|  |   # Additional sleep to wait for the upgrade to start deploy a new version | ||||||
|  |   sleep 15 | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #bats test_tags=phase:helm,scenario:vanilla | #bats test_tags=phase:helm,scenario:vanilla | ||||||
|  | @ -177,30 +184,21 @@ diag() { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #bats test_tags=phase:helm,scenario:vanilla | #bats test_tags=phase:helm,scenario:vanilla | ||||||
| @test "1.13 Helm: check Jenkins operator pods status" { | @test "1.13 Helm: check Jenkins Pod status" { | ||||||
|   [[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly" |  | ||||||
|   run verify "there is 1 deployment named 'default-jenkins-operator'" |  | ||||||
|   assert_success |  | ||||||
| 
 |  | ||||||
|   run verify "there is 1 pod named 'default-jenkins-operator-'" |  | ||||||
|   assert_success |  | ||||||
| 
 |  | ||||||
|   run try "at most 20 times every 10s to get pods named 'default-jenkins-operator-' and verify that '.status.containerStatuses[?(@.name==\"jenkins-operator\")].ready' is 'true'" |  | ||||||
|   assert_success |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| #bats test_tags=phase:helm,scenario:vanilla |  | ||||||
| @test "1.14 Helm: check Jenkins Pod status" { |  | ||||||
|   [[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly" |   [[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly" | ||||||
|   run try "at most 20 times every 10s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"jenkins-master\")].ready' is 'true'" |   run try "at most 20 times every 10s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"jenkins-master\")].ready' is 'true'" | ||||||
|   assert_success |   assert_success | ||||||
| 
 | 
 | ||||||
|   run try "at most 20 times every 5s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"jenkins-master\")].ready' is 'true'" |   run try "at most 20 times every 5s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"backup\")].ready' is 'true'" | ||||||
|   assert_success |   assert_success | ||||||
|  | 
 | ||||||
|  |   run ${KUBECTL} logs -l jenkins-cr=jenkins --tail=-1 | ||||||
|  |   assert_success | ||||||
|  |   assert_output --partial 'Jenkins is fully up and running' | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #bats test_tags=phase:helm,scenario:vanilla | #bats test_tags=phase:helm,scenario:vanilla | ||||||
| @test "1.15 Helm: clean" { | @test "1.14 Helm: clean" { | ||||||
|   run ${HELM} uninstall default --wait |   run ${HELM} uninstall default --wait | ||||||
|   assert_success |   assert_success | ||||||
|   # Wait for the complete removal |   # Wait for the complete removal | ||||||
|  |  | ||||||
|  | @ -29,7 +29,7 @@ setup() { | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.nodeSelector.batstest=yep \ |     --set jenkins.nodeSelector.batstest=yep \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.479.2-lts" \ |     --set jenkins.image="jenkins/jenkins:2.492.3-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=false \ |     --set jenkins.backup.makeBackupBeforePodDeletion=false \ | ||||||
|     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ |     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ | ||||||
|  | @ -107,7 +107,7 @@ setup() { | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.nodeSelector.batstest=yep \ |     --set jenkins.nodeSelector.batstest=yep \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.479.2-lts" \ |     --set jenkins.image="jenkins/jenkins:2.492.3-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.lifecycle.preStop.exec.command="{echo bats-test}" \ |     --set jenkins.lifecycle.preStop.exec.command="{echo bats-test}" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=false \ |     --set jenkins.backup.makeBackupBeforePodDeletion=false \ | ||||||
|  |  | ||||||
|  | @ -29,7 +29,7 @@ setup() { | ||||||
|     --set namespace=${DETIK_CLIENT_NAMESPACE} \ |     --set namespace=${DETIK_CLIENT_NAMESPACE} \ | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.479.2-lts" \ |     --set jenkins.image="jenkins/jenkins:2.492.3-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=true \ |     --set jenkins.backup.makeBackupBeforePodDeletion=true \ | ||||||
|     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ |     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ | ||||||
|  | @ -90,7 +90,7 @@ setup() { | ||||||
|     --set namespace=${DETIK_CLIENT_NAMESPACE} \ |     --set namespace=${DETIK_CLIENT_NAMESPACE} \ | ||||||
|     --set operator.image=${OPERATOR_IMAGE} \ |     --set operator.image=${OPERATOR_IMAGE} \ | ||||||
|     --set jenkins.latestPlugins=true \ |     --set jenkins.latestPlugins=true \ | ||||||
|     --set jenkins.image="jenkins/jenkins:2.479.2-lts" \ |     --set jenkins.image="jenkins/jenkins:2.492.3-lts" \ | ||||||
|     --set jenkins.imagePullPolicy="IfNotPresent" \ |     --set jenkins.imagePullPolicy="IfNotPresent" \ | ||||||
|     --set jenkins.backup.makeBackupBeforePodDeletion=true \ |     --set jenkins.backup.makeBackupBeforePodDeletion=true \ | ||||||
|     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ |     --set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \ | ||||||
|  |  | ||||||
|  | @ -128,7 +128,7 @@ func createJenkinsCRSafeRestart(name, namespace string, seedJob *[]v1alpha2.Seed | ||||||
| 					{Name: "audit-trail", Version: "361.v82cde86c784e"}, | 					{Name: "audit-trail", Version: "361.v82cde86c784e"}, | ||||||
| 					{Name: "simple-theme-plugin", Version: "176.v39740c03a_a_f5"}, | 					{Name: "simple-theme-plugin", Version: "176.v39740c03a_a_f5"}, | ||||||
| 					{Name: "github", Version: "1.38.0"}, | 					{Name: "github", Version: "1.38.0"}, | ||||||
| 					{Name: "devoptics", Version: "2.0", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/2.0/devoptics.hpi"}, | 					{Name: "cloudbees-disk-usage-simple", Version: "239.v6a_f1a_c1c8046", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/cloudbees-disk-usage-simple/239.v6a_f1a_c1c8046/cloudbees-disk-usage-simple.hpi"}, | ||||||
| 				}, | 				}, | ||||||
| 				PriorityClassName: priorityClassName, | 				PriorityClassName: priorityClassName, | ||||||
| 				NodeSelector:      map[string]string{"kubernetes.io/os": "linux"}, | 				NodeSelector:      map[string]string{"kubernetes.io/os": "linux"}, | ||||||
|  |  | ||||||
|  | @ -21,7 +21,7 @@ import ( | ||||||
| 	"sigs.k8s.io/controller-runtime/pkg/envtest" | 	"sigs.k8s.io/controller-runtime/pkg/envtest" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| const JenkinsTestImage = "jenkins/jenkins:2.479.2-lts" | const JenkinsTestImage = "jenkins/jenkins:2.492.3-lts" | ||||||
| 
 | 
 | ||||||
| var ( | var ( | ||||||
| 	Cfg       *rest.Config | 	Cfg       *rest.Config | ||||||
|  | @ -151,7 +151,7 @@ func RenderJenkinsCR(name, namespace string, seedJob *[]v1alpha2.SeedJob, groovy | ||||||
| 					{Name: "audit-trail", Version: "361.v82cde86c784e"}, | 					{Name: "audit-trail", Version: "361.v82cde86c784e"}, | ||||||
| 					{Name: "simple-theme-plugin", Version: "176.v39740c03a_a_f5"}, | 					{Name: "simple-theme-plugin", Version: "176.v39740c03a_a_f5"}, | ||||||
| 					{Name: "github", Version: "1.38.0"}, | 					{Name: "github", Version: "1.38.0"}, | ||||||
| 					{Name: "devoptics", Version: "2.0", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/2.0/devoptics.hpi"}, | 					{Name: "cloudbees-disk-usage-simple", Version: "239.v6a_f1a_c1c8046", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/cloudbees-disk-usage-simple/239.v6a_f1a_c1c8046/cloudbees-disk-usage-simple.hpi"}, | ||||||
| 				}, | 				}, | ||||||
| 				PriorityClassName: priorityClassName, | 				PriorityClassName: priorityClassName, | ||||||
| 				NodeSelector:      map[string]string{"kubernetes.io/os": "linux"}, | 				NodeSelector:      map[string]string{"kubernetes.io/os": "linux"}, | ||||||
|  |  | ||||||
|  | @ -47,7 +47,7 @@ var _ = Describe("Jenkins Controller", func() { | ||||||
| 
 | 
 | ||||||
| 			cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug", | 			cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug", | ||||||
| 				"--set-string", fmt.Sprintf("jenkins.namespace=%s", namespace.Name), | 				"--set-string", fmt.Sprintf("jenkins.namespace=%s", namespace.Name), | ||||||
| 				"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.479.2-lts"), | 				"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.492.3-lts"), | ||||||
| 				"--set-string", fmt.Sprintf("operator.image=%s", *imageName), | 				"--set-string", fmt.Sprintf("operator.image=%s", *imageName), | ||||||
| 				"--set-string", fmt.Sprintf("backup.image=%s", "quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test"), | 				"--set-string", fmt.Sprintf("backup.image=%s", "quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test"), | ||||||
| 				"--set-string", fmt.Sprintf("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install") | 				"--set-string", fmt.Sprintf("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install") | ||||||
|  |  | ||||||
|  | @ -6,56 +6,9 @@ | ||||||
|     "": { |     "": { | ||||||
|       "name": "website", |       "name": "website", | ||||||
|       "devDependencies": { |       "devDependencies": { | ||||||
|         "autoprefixer": "^10.4.18", |         "autoprefixer": "^10.4.21", | ||||||
|         "postcss": "^8.4.35", |         "postcss": "^8.5.3", | ||||||
|         "postcss-cli": "^11.0.0" |         "postcss-cli": "^11.0.1" | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/@nodelib/fs.scandir": { |  | ||||||
|       "version": "2.1.5", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", |  | ||||||
|       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "@nodelib/fs.stat": "2.0.5", |  | ||||||
|         "run-parallel": "^1.1.9" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">= 8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/@nodelib/fs.stat": { |  | ||||||
|       "version": "2.0.5", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", |  | ||||||
|       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">= 8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/@nodelib/fs.walk": { |  | ||||||
|       "version": "1.2.8", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", |  | ||||||
|       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "@nodelib/fs.scandir": "2.1.5", |  | ||||||
|         "fastq": "^1.6.0" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">= 8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/@sindresorhus/merge-streams": { |  | ||||||
|       "version": "2.3.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", |  | ||||||
|       "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=18" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/sindresorhus" |  | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/ansi-regex": { |     "node_modules/ansi-regex": { | ||||||
|  | @ -96,9 +49,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/autoprefixer": { |     "node_modules/autoprefixer": { | ||||||
|       "version": "10.4.18", |       "version": "10.4.21", | ||||||
|       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz", |       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz", | ||||||
|       "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==", |       "integrity": "sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "funding": [ |       "funding": [ | ||||||
|         { |         { | ||||||
|  | @ -114,12 +67,13 @@ | ||||||
|           "url": "https://github.com/sponsors/ai" |           "url": "https://github.com/sponsors/ai" | ||||||
|         } |         } | ||||||
|       ], |       ], | ||||||
|  |       "license": "MIT", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "browserslist": "^4.23.0", |         "browserslist": "^4.24.4", | ||||||
|         "caniuse-lite": "^1.0.30001591", |         "caniuse-lite": "^1.0.30001702", | ||||||
|         "fraction.js": "^4.3.7", |         "fraction.js": "^4.3.7", | ||||||
|         "normalize-range": "^0.1.2", |         "normalize-range": "^0.1.2", | ||||||
|         "picocolors": "^1.0.0", |         "picocolors": "^1.1.1", | ||||||
|         "postcss-value-parser": "^4.2.0" |         "postcss-value-parser": "^4.2.0" | ||||||
|       }, |       }, | ||||||
|       "bin": { |       "bin": { | ||||||
|  | @ -154,9 +108,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/browserslist": { |     "node_modules/browserslist": { | ||||||
|       "version": "4.23.0", |       "version": "4.24.4", | ||||||
|       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", |       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", | ||||||
|       "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", |       "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "funding": [ |       "funding": [ | ||||||
|         { |         { | ||||||
|  | @ -172,11 +126,12 @@ | ||||||
|           "url": "https://github.com/sponsors/ai" |           "url": "https://github.com/sponsors/ai" | ||||||
|         } |         } | ||||||
|       ], |       ], | ||||||
|  |       "license": "MIT", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "caniuse-lite": "^1.0.30001587", |         "caniuse-lite": "^1.0.30001688", | ||||||
|         "electron-to-chromium": "^1.4.668", |         "electron-to-chromium": "^1.5.73", | ||||||
|         "node-releases": "^2.0.14", |         "node-releases": "^2.0.19", | ||||||
|         "update-browserslist-db": "^1.0.13" |         "update-browserslist-db": "^1.1.1" | ||||||
|       }, |       }, | ||||||
|       "bin": { |       "bin": { | ||||||
|         "browserslist": "cli.js" |         "browserslist": "cli.js" | ||||||
|  | @ -186,9 +141,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/caniuse-lite": { |     "node_modules/caniuse-lite": { | ||||||
|       "version": "1.0.30001596", |       "version": "1.0.30001707", | ||||||
|       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001596.tgz", |       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", | ||||||
|       "integrity": "sha512-zpkZ+kEr6We7w63ORkoJ2pOfBwBkY/bJrG/UZ90qNb45Isblu8wzDgevEOrRL1r9dWayHjYiiyCMEXPn4DweGQ==", |       "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "funding": [ |       "funding": [ | ||||||
|         { |         { | ||||||
|  | @ -203,7 +158,8 @@ | ||||||
|           "type": "github", |           "type": "github", | ||||||
|           "url": "https://github.com/sponsors/ai" |           "url": "https://github.com/sponsors/ai" | ||||||
|         } |         } | ||||||
|       ] |       ], | ||||||
|  |       "license": "CC-BY-4.0" | ||||||
|     }, |     }, | ||||||
|     "node_modules/chokidar": { |     "node_modules/chokidar": { | ||||||
|       "version": "3.6.0", |       "version": "3.6.0", | ||||||
|  | @ -262,19 +218,21 @@ | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "node_modules/dependency-graph": { |     "node_modules/dependency-graph": { | ||||||
|       "version": "0.11.0", |       "version": "1.0.0", | ||||||
|       "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", |       "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-1.0.0.tgz", | ||||||
|       "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", |       "integrity": "sha512-cW3gggJ28HZ/LExwxP2B++aiKxhJXMSIt9K48FOXQkm+vuG5gyatXnLsONRJdzO/7VfjDIiaOOa/bs4l464Lwg==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|  |       "license": "MIT", | ||||||
|       "engines": { |       "engines": { | ||||||
|         "node": ">= 0.6.0" |         "node": ">=4" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/electron-to-chromium": { |     "node_modules/electron-to-chromium": { | ||||||
|       "version": "1.4.695", |       "version": "1.5.128", | ||||||
|       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.695.tgz", |       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.128.tgz", | ||||||
|       "integrity": "sha512-eMijZmeqPtm774pCZIOrfUHMs/7ls++W1sLhxwqgu8KQ8E2WmMtzwyqOMt0XXUJ3HTIPfuwlfwF+I5cwnfItBA==", |       "integrity": "sha512-bo1A4HH/NS522Ws0QNFIzyPcyUUNV/yyy70Ho1xqfGYzPUme2F/xr4tlEOuM6/A538U1vDA7a4XfCd1CKRegKQ==", | ||||||
|       "dev": true |       "dev": true, | ||||||
|  |       "license": "ISC" | ||||||
|     }, |     }, | ||||||
|     "node_modules/emoji-regex": { |     "node_modules/emoji-regex": { | ||||||
|       "version": "8.0.0", |       "version": "8.0.0", | ||||||
|  | @ -283,39 +241,15 @@ | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "node_modules/escalade": { |     "node_modules/escalade": { | ||||||
|       "version": "3.1.2", |       "version": "3.2.0", | ||||||
|       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", |       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", | ||||||
|       "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", |       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|  |       "license": "MIT", | ||||||
|       "engines": { |       "engines": { | ||||||
|         "node": ">=6" |         "node": ">=6" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/fast-glob": { |  | ||||||
|       "version": "3.3.2", |  | ||||||
|       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", |  | ||||||
|       "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "@nodelib/fs.stat": "^2.0.2", |  | ||||||
|         "@nodelib/fs.walk": "^1.2.3", |  | ||||||
|         "glob-parent": "^5.1.2", |  | ||||||
|         "merge2": "^1.3.0", |  | ||||||
|         "micromatch": "^4.0.4" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8.6.0" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/fastq": { |  | ||||||
|       "version": "1.17.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", |  | ||||||
|       "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "reusify": "^1.0.4" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/fill-range": { |     "node_modules/fill-range": { | ||||||
|       "version": "7.1.1", |       "version": "7.1.1", | ||||||
|       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", |       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", | ||||||
|  | @ -378,18 +312,6 @@ | ||||||
|         "node": "6.* || 8.* || >= 10.*" |         "node": "6.* || 8.* || >= 10.*" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/get-stdin": { |  | ||||||
|       "version": "9.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz", |  | ||||||
|       "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=12" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/sindresorhus" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/glob-parent": { |     "node_modules/glob-parent": { | ||||||
|       "version": "5.1.2", |       "version": "5.1.2", | ||||||
|       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", |       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", | ||||||
|  | @ -402,41 +324,12 @@ | ||||||
|         "node": ">= 6" |         "node": ">= 6" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/globby": { |  | ||||||
|       "version": "14.0.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz", |  | ||||||
|       "integrity": "sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "@sindresorhus/merge-streams": "^2.1.0", |  | ||||||
|         "fast-glob": "^3.3.2", |  | ||||||
|         "ignore": "^5.2.4", |  | ||||||
|         "path-type": "^5.0.0", |  | ||||||
|         "slash": "^5.1.0", |  | ||||||
|         "unicorn-magic": "^0.1.0" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=18" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/sindresorhus" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/graceful-fs": { |     "node_modules/graceful-fs": { | ||||||
|       "version": "4.2.11", |       "version": "4.2.11", | ||||||
|       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", |       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", | ||||||
|       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", |       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "node_modules/ignore": { |  | ||||||
|       "version": "5.3.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", |  | ||||||
|       "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">= 4" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/is-binary-path": { |     "node_modules/is-binary-path": { | ||||||
|       "version": "2.1.0", |       "version": "2.1.0", | ||||||
|       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", |       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", | ||||||
|  | @ -512,32 +405,10 @@ | ||||||
|         "url": "https://github.com/sponsors/antonk52" |         "url": "https://github.com/sponsors/antonk52" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/merge2": { |  | ||||||
|       "version": "1.4.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", |  | ||||||
|       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">= 8" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/micromatch": { |  | ||||||
|       "version": "4.0.5", |  | ||||||
|       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", |  | ||||||
|       "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "dependencies": { |  | ||||||
|         "braces": "^3.0.2", |  | ||||||
|         "picomatch": "^2.3.1" |  | ||||||
|       }, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=8.6" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/nanoid": { |     "node_modules/nanoid": { | ||||||
|       "version": "3.3.7", |       "version": "3.3.11", | ||||||
|       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", |       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", | ||||||
|       "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", |       "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "funding": [ |       "funding": [ | ||||||
|         { |         { | ||||||
|  | @ -545,6 +416,7 @@ | ||||||
|           "url": "https://github.com/sponsors/ai" |           "url": "https://github.com/sponsors/ai" | ||||||
|         } |         } | ||||||
|       ], |       ], | ||||||
|  |       "license": "MIT", | ||||||
|       "bin": { |       "bin": { | ||||||
|         "nanoid": "bin/nanoid.cjs" |         "nanoid": "bin/nanoid.cjs" | ||||||
|       }, |       }, | ||||||
|  | @ -553,10 +425,11 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/node-releases": { |     "node_modules/node-releases": { | ||||||
|       "version": "2.0.14", |       "version": "2.0.19", | ||||||
|       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", |       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", | ||||||
|       "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", |       "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", | ||||||
|       "dev": true |       "dev": true, | ||||||
|  |       "license": "MIT" | ||||||
|     }, |     }, | ||||||
|     "node_modules/normalize-path": { |     "node_modules/normalize-path": { | ||||||
|       "version": "3.0.0", |       "version": "3.0.0", | ||||||
|  | @ -576,23 +449,12 @@ | ||||||
|         "node": ">=0.10.0" |         "node": ">=0.10.0" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/path-type": { |  | ||||||
|       "version": "5.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", |  | ||||||
|       "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=12" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/sindresorhus" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/picocolors": { |     "node_modules/picocolors": { | ||||||
|       "version": "1.0.0", |       "version": "1.1.1", | ||||||
|       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", |       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", | ||||||
|       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", |       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", | ||||||
|       "dev": true |       "dev": true, | ||||||
|  |       "license": "ISC" | ||||||
|     }, |     }, | ||||||
|     "node_modules/picomatch": { |     "node_modules/picomatch": { | ||||||
|       "version": "2.3.1", |       "version": "2.3.1", | ||||||
|  | @ -616,9 +478,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/postcss": { |     "node_modules/postcss": { | ||||||
|       "version": "8.4.35", |       "version": "8.5.3", | ||||||
|       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", |       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", | ||||||
|       "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==", |       "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "funding": [ |       "funding": [ | ||||||
|         { |         { | ||||||
|  | @ -634,32 +496,33 @@ | ||||||
|           "url": "https://github.com/sponsors/ai" |           "url": "https://github.com/sponsors/ai" | ||||||
|         } |         } | ||||||
|       ], |       ], | ||||||
|  |       "license": "MIT", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "nanoid": "^3.3.7", |         "nanoid": "^3.3.8", | ||||||
|         "picocolors": "^1.0.0", |         "picocolors": "^1.1.1", | ||||||
|         "source-map-js": "^1.0.2" |         "source-map-js": "^1.2.1" | ||||||
|       }, |       }, | ||||||
|       "engines": { |       "engines": { | ||||||
|         "node": "^10 || ^12 || >=14" |         "node": "^10 || ^12 || >=14" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/postcss-cli": { |     "node_modules/postcss-cli": { | ||||||
|       "version": "11.0.0", |       "version": "11.0.1", | ||||||
|       "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-11.0.0.tgz", |       "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-11.0.1.tgz", | ||||||
|       "integrity": "sha512-xMITAI7M0u1yolVcXJ9XTZiO9aO49mcoKQy6pCDFdMh9kGqhzLVpWxeD/32M/QBmkhcGypZFFOLNLmIW4Pg4RA==", |       "integrity": "sha512-0UnkNPSayHKRe/tc2YGW6XnSqqOA9eqpiRMgRlV1S6HdGi16vwJBx7lviARzbV1HpQHqLLRH3o8vTcB0cLc+5g==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|  |       "license": "MIT", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "chokidar": "^3.3.0", |         "chokidar": "^3.3.0", | ||||||
|         "dependency-graph": "^0.11.0", |         "dependency-graph": "^1.0.0", | ||||||
|         "fs-extra": "^11.0.0", |         "fs-extra": "^11.0.0", | ||||||
|         "get-stdin": "^9.0.0", |  | ||||||
|         "globby": "^14.0.0", |  | ||||||
|         "picocolors": "^1.0.0", |         "picocolors": "^1.0.0", | ||||||
|         "postcss-load-config": "^5.0.0", |         "postcss-load-config": "^5.0.0", | ||||||
|         "postcss-reporter": "^7.0.0", |         "postcss-reporter": "^7.0.0", | ||||||
|         "pretty-hrtime": "^1.0.3", |         "pretty-hrtime": "^1.0.3", | ||||||
|         "read-cache": "^1.0.0", |         "read-cache": "^1.0.0", | ||||||
|         "slash": "^5.0.0", |         "slash": "^5.0.0", | ||||||
|  |         "tinyglobby": "^0.2.12", | ||||||
|         "yargs": "^17.0.0" |         "yargs": "^17.0.0" | ||||||
|       }, |       }, | ||||||
|       "bin": { |       "bin": { | ||||||
|  | @ -748,26 +611,6 @@ | ||||||
|         "node": ">= 0.8" |         "node": ">= 0.8" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/queue-microtask": { |  | ||||||
|       "version": "1.2.3", |  | ||||||
|       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", |  | ||||||
|       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", |  | ||||||
|       "dev": true, |  | ||||||
|       "funding": [ |  | ||||||
|         { |  | ||||||
|           "type": "github", |  | ||||||
|           "url": "https://github.com/sponsors/feross" |  | ||||||
|         }, |  | ||||||
|         { |  | ||||||
|           "type": "patreon", |  | ||||||
|           "url": "https://www.patreon.com/feross" |  | ||||||
|         }, |  | ||||||
|         { |  | ||||||
|           "type": "consulting", |  | ||||||
|           "url": "https://feross.org/support" |  | ||||||
|         } |  | ||||||
|       ] |  | ||||||
|     }, |  | ||||||
|     "node_modules/read-cache": { |     "node_modules/read-cache": { | ||||||
|       "version": "1.0.0", |       "version": "1.0.0", | ||||||
|       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", |       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", | ||||||
|  | @ -798,44 +641,12 @@ | ||||||
|         "node": ">=0.10.0" |         "node": ">=0.10.0" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/reusify": { |  | ||||||
|       "version": "1.0.4", |  | ||||||
|       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", |  | ||||||
|       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "iojs": ">=1.0.0", |  | ||||||
|         "node": ">=0.10.0" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/run-parallel": { |  | ||||||
|       "version": "1.2.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", |  | ||||||
|       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "funding": [ |  | ||||||
|         { |  | ||||||
|           "type": "github", |  | ||||||
|           "url": "https://github.com/sponsors/feross" |  | ||||||
|         }, |  | ||||||
|         { |  | ||||||
|           "type": "patreon", |  | ||||||
|           "url": "https://www.patreon.com/feross" |  | ||||||
|         }, |  | ||||||
|         { |  | ||||||
|           "type": "consulting", |  | ||||||
|           "url": "https://feross.org/support" |  | ||||||
|         } |  | ||||||
|       ], |  | ||||||
|       "dependencies": { |  | ||||||
|         "queue-microtask": "^1.2.2" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/slash": { |     "node_modules/slash": { | ||||||
|       "version": "5.1.0", |       "version": "5.1.0", | ||||||
|       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", |       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", | ||||||
|       "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", |       "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|  |       "license": "MIT", | ||||||
|       "engines": { |       "engines": { | ||||||
|         "node": ">=14.16" |         "node": ">=14.16" | ||||||
|       }, |       }, | ||||||
|  | @ -844,10 +655,11 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/source-map-js": { |     "node_modules/source-map-js": { | ||||||
|       "version": "1.0.2", |       "version": "1.2.1", | ||||||
|       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", |       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", | ||||||
|       "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", |       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|  |       "license": "BSD-3-Clause", | ||||||
|       "engines": { |       "engines": { | ||||||
|         "node": ">=0.10.0" |         "node": ">=0.10.0" | ||||||
|       } |       } | ||||||
|  | @ -884,6 +696,51 @@ | ||||||
|       "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==", |       "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|  |     "node_modules/tinyglobby": { | ||||||
|  |       "version": "0.2.12", | ||||||
|  |       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz", | ||||||
|  |       "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==", | ||||||
|  |       "dev": true, | ||||||
|  |       "license": "MIT", | ||||||
|  |       "dependencies": { | ||||||
|  |         "fdir": "^6.4.3", | ||||||
|  |         "picomatch": "^4.0.2" | ||||||
|  |       }, | ||||||
|  |       "engines": { | ||||||
|  |         "node": ">=12.0.0" | ||||||
|  |       }, | ||||||
|  |       "funding": { | ||||||
|  |         "url": "https://github.com/sponsors/SuperchupuDev" | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "node_modules/tinyglobby/node_modules/fdir": { | ||||||
|  |       "version": "6.4.3", | ||||||
|  |       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz", | ||||||
|  |       "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==", | ||||||
|  |       "dev": true, | ||||||
|  |       "license": "MIT", | ||||||
|  |       "peerDependencies": { | ||||||
|  |         "picomatch": "^3 || ^4" | ||||||
|  |       }, | ||||||
|  |       "peerDependenciesMeta": { | ||||||
|  |         "picomatch": { | ||||||
|  |           "optional": true | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "node_modules/tinyglobby/node_modules/picomatch": { | ||||||
|  |       "version": "4.0.2", | ||||||
|  |       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", | ||||||
|  |       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", | ||||||
|  |       "dev": true, | ||||||
|  |       "license": "MIT", | ||||||
|  |       "engines": { | ||||||
|  |         "node": ">=12" | ||||||
|  |       }, | ||||||
|  |       "funding": { | ||||||
|  |         "url": "https://github.com/sponsors/jonschlinkert" | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|     "node_modules/to-regex-range": { |     "node_modules/to-regex-range": { | ||||||
|       "version": "5.0.1", |       "version": "5.0.1", | ||||||
|       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", |       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", | ||||||
|  | @ -896,18 +753,6 @@ | ||||||
|         "node": ">=8.0" |         "node": ">=8.0" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/unicorn-magic": { |  | ||||||
|       "version": "0.1.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", |  | ||||||
|       "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "engines": { |  | ||||||
|         "node": ">=18" |  | ||||||
|       }, |  | ||||||
|       "funding": { |  | ||||||
|         "url": "https://github.com/sponsors/sindresorhus" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "node_modules/universalify": { |     "node_modules/universalify": { | ||||||
|       "version": "2.0.1", |       "version": "2.0.1", | ||||||
|       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", |       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", | ||||||
|  | @ -918,9 +763,9 @@ | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/update-browserslist-db": { |     "node_modules/update-browserslist-db": { | ||||||
|       "version": "1.0.13", |       "version": "1.1.3", | ||||||
|       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", |       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", | ||||||
|       "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", |       "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "funding": [ |       "funding": [ | ||||||
|         { |         { | ||||||
|  | @ -936,9 +781,10 @@ | ||||||
|           "url": "https://github.com/sponsors/ai" |           "url": "https://github.com/sponsors/ai" | ||||||
|         } |         } | ||||||
|       ], |       ], | ||||||
|  |       "license": "MIT", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "escalade": "^3.1.1", |         "escalade": "^3.2.0", | ||||||
|         "picocolors": "^1.0.0" |         "picocolors": "^1.1.1" | ||||||
|       }, |       }, | ||||||
|       "bin": { |       "bin": { | ||||||
|         "update-browserslist-db": "cli.js" |         "update-browserslist-db": "cli.js" | ||||||
|  |  | ||||||
|  | @ -4,8 +4,8 @@ | ||||||
|         "build": "echo $BASE_URL; hugo --minify --baseURL=${BASE_URL}" |         "build": "echo $BASE_URL; hugo --minify --baseURL=${BASE_URL}" | ||||||
|     }, |     }, | ||||||
|     "devDependencies": { |     "devDependencies": { | ||||||
|     "autoprefixer": "^10.4.18", |     "autoprefixer": "^10.4.21", | ||||||
|     "postcss": "^8.4.35", |     "postcss": "^8.5.3", | ||||||
|     "postcss-cli": "^11.0.0" |     "postcss-cli": "^11.0.1" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue