Merge 8252d86541 into 0baa4f6b09
				
					
				
			This commit is contained in:
		
						commit
						940daa074d
					
				
							
								
								
									
										4
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										4
									
								
								Makefile
								
								
								
								
							|  | @ -6,7 +6,7 @@ endif | ||||||
| DOCKER_USER ?= $(shell echo ${DOCKER_IMAGE_NAME} | cut -d / -f1) | DOCKER_USER ?= $(shell echo ${DOCKER_IMAGE_NAME} | cut -d / -f1) | ||||||
| VERSION ?= dev | VERSION ?= dev | ||||||
| COMMIT_SHA = $(shell git rev-parse HEAD) | COMMIT_SHA = $(shell git rev-parse HEAD) | ||||||
| RUNNER_VERSION ?= 2.328.0 | RUNNER_VERSION ?= 2.329.0 | ||||||
| TARGETPLATFORM ?= $(shell arch) | TARGETPLATFORM ?= $(shell arch) | ||||||
| RUNNER_NAME ?= ${DOCKER_USER}/actions-runner | RUNNER_NAME ?= ${DOCKER_USER}/actions-runner | ||||||
| RUNNER_TAG  ?= ${VERSION} | RUNNER_TAG  ?= ${VERSION} | ||||||
|  | @ -307,7 +307,7 @@ github-release: release | ||||||
| # Otherwise we get errors like the below:
 | # Otherwise we get errors like the below:
 | ||||||
| #   Error: failed to install CRD crds/actions.summerwind.dev_runnersets.yaml: CustomResourceDefinition.apiextensions.k8s.io "runnersets.actions.summerwind.dev" is invalid: [spec.validation.openAPIV3Schema.properties[spec].properties[template].properties[spec].properties[containers].items.properties[ports].items.properties[protocol].default: Required value: this property is in x-kubernetes-list-map-keys, so it must have a default or be a required property, spec.validation.openAPIV3Schema.properties[spec].properties[template].properties[spec].properties[initContainers].items.properties[ports].items.properties[protocol].default: Required value: this property is in x-kubernetes-list-map-keys, so it must have a default or be a required property]
 | #   Error: failed to install CRD crds/actions.summerwind.dev_runnersets.yaml: CustomResourceDefinition.apiextensions.k8s.io "runnersets.actions.summerwind.dev" is invalid: [spec.validation.openAPIV3Schema.properties[spec].properties[template].properties[spec].properties[containers].items.properties[ports].items.properties[protocol].default: Required value: this property is in x-kubernetes-list-map-keys, so it must have a default or be a required property, spec.validation.openAPIV3Schema.properties[spec].properties[template].properties[spec].properties[initContainers].items.properties[ports].items.properties[protocol].default: Required value: this property is in x-kubernetes-list-map-keys, so it must have a default or be a required property]
 | ||||||
| #
 | #
 | ||||||
| # Note that controller-gen newer than 0.7.0 is needed due to https://github.com/kubernetes-sigs/controller-tools/issues/448
 | # Note that controller-gen newer than 0.8.0 is needed due to https://github.com/kubernetes-sigs/controller-tools/issues/448
 | ||||||
| # Otherwise ObjectMeta embedded in Spec results in empty on the storage.
 | # Otherwise ObjectMeta embedded in Spec results in empty on the storage.
 | ||||||
| controller-gen: | controller-gen: | ||||||
| ifeq (, $(shell which controller-gen)) | ifeq (, $(shell which controller-gen)) | ||||||
|  |  | ||||||
|  | @ -6,8 +6,8 @@ DIND_ROOTLESS_RUNNER_NAME ?= ${DOCKER_USER}/actions-runner-dind-rootless | ||||||
| OS_IMAGE ?= ubuntu-22.04 | OS_IMAGE ?= ubuntu-22.04 | ||||||
| TARGETPLATFORM ?= $(shell arch) | TARGETPLATFORM ?= $(shell arch) | ||||||
| 
 | 
 | ||||||
| RUNNER_VERSION ?= 2.328.0 | RUNNER_VERSION ?= 2.329.0 | ||||||
| RUNNER_CONTAINER_HOOKS_VERSION ?= 0.7.0 | RUNNER_CONTAINER_HOOKS_VERSION ?= 0.8.0 | ||||||
| DOCKER_VERSION ?= 24.0.7 | DOCKER_VERSION ?= 24.0.7 | ||||||
| 
 | 
 | ||||||
| # default list of platforms for which multiarch image is built
 | # default list of platforms for which multiarch image is built
 | ||||||
|  |  | ||||||
|  | @ -1,2 +1,2 @@ | ||||||
| RUNNER_VERSION=2.328.0 | RUNNER_VERSION=2.329.0 | ||||||
| RUNNER_CONTAINER_HOOKS_VERSION=0.7.0 | RUNNER_CONTAINER_HOOKS_VERSION=0.8.0 | ||||||
|  | @ -36,8 +36,8 @@ var ( | ||||||
| 
 | 
 | ||||||
| 	testResultCMNamePrefix = "test-result-" | 	testResultCMNamePrefix = "test-result-" | ||||||
| 
 | 
 | ||||||
| 	RunnerVersion               = "2.328.0" | 	RunnerVersion               = "2.329.0" | ||||||
| 	RunnerContainerHooksVersion = "0.7.0" | 	RunnerContainerHooksVersion = "0.8.0" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // If you're willing to run this test via VS Code "run test" or "debug test",
 | // If you're willing to run this test via VS Code "run test" or "debug test",
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue