Sync from upstream #455
Sync from upstream #455
Conversation
ref: https://issues.redhat.com/browse/ACM-3042 Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com> (cherry picked from commit 7208f75)
ref: https://issues.redhat.com/browse/ACM-3321 Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com> (cherry picked from commit 6e9bc97) Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com>
Signed-off-by: Will Kutler <wkutler@redhat.com> (cherry picked from commit da14bdd)
Signed-off-by: Will Kutler <wkutler@redhat.com> (cherry picked from commit e868a2b)
Description of problem: When Pod security policy is created and the status is changed from inform to enforce, the status is toggling. Not able to enforce pod security policy. How to fix Set default value when Kube API value omitted ref: https://issues.redhat.com/browse/ACM-3109 Signed-off-by: Yi Rae Kim <yikim@redhat.com> (cherry picked from commit b70748b)
| # Test coverage threshold | ||
| export COVERAGE_MIN ?= 75 | ||
| COVERAGE_E2E_OUT ?= coverage_e2e.out | ||
|
|
||
| # Image URL to use all building/pushing image targets; | ||
| # Use your own docker registry and image name for dev/test by overridding the IMG and REGISTRY environment variable. | ||
| IMG ?= $(shell cat COMPONENT_NAME 2> /dev/null) | ||
| IMG ?= $(CONTROLLER_NAME) |
There was a problem hiding this comment.
Conflict here was:
<<<<<<< HEAD
IMG ?= $(shell cat COMPONENT_NAME 2> /dev/null)
REGISTRY ?= quay.io/stolostron
=======
IMG ?= $(CONTROLLER_NAME)
REGISTRY ?= quay.io/open-cluster-management
>>>>>>> 6e9bc97 (Sync the common Makefile)
| KUBEBUILDER = $(LOCAL_BIN)/kubebuilder | ||
| KBVERSION = 3.9.1 | ||
| K8S_VERSION = 1.26.1 | ||
| GOSEC = $(LOCAL_BIN)/gosec |
There was a problem hiding this comment.
Conflict here was:
<<<<<<< HEAD
format-go:
@${FINDFILES} -name '*.go' \( ! \( -name '*.gen.go' -o -name '*.pb.go' \) \) -print0 | ${XARGS} goimports -w -local "github.com/stolostron"
=======
############################################################
# Unit Test
############################################################
KUBEBUILDER = $(LOCAL_BIN)/kubebuilder
KBVERSION = 3.9.1
K8S_VERSION = 1.26.1
GOSEC = $(LOCAL_BIN)/gosec
>>>>>>> 6e9bc97 (Sync the common Makefile)
| @@ -1,10 +1,6 @@ | |||
| service: | |||
| # When updating this, also update the version stored in docker/build-tools/Dockerfile in the multicloudlab/tools repo. | |||
| golangci-lint-version: 1.19.x # use the fixed version to not introduce new linters unexpectedly | |||
There was a problem hiding this comment.
Conflict here was:
<<<<<<< HEAD
service:
# When updating this, also update the version stored in docker/build-tools/Dockerfile in the multicloudlab/tools repo.
golangci-lint-version: 1.19.x # use the fixed version to not introduce new linters unexpectedly
=======
>>>>>>> 6e9bc97 (Sync the common Makefile)
|
Kudos, SonarCloud Quality Gate passed! |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dhaiducek, JustinKuli The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/override Pipelines as Code CI / config-policy-controller-0pyc-on-pull-request |
|
@JustinKuli: /override requires failed status contexts, check run or a prowjob name to operate on.
Only the following failed contexts/checkruns were expected:
If you are trying to override a checkrun that has a space in it, you must put a double quote on the context. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/override "Pipelines as Code CI / config-policy-controller-0pyc-on-pull-request" |
|
@JustinKuli: Overrode contexts on behalf of JustinKuli: Pipelines as Code CI / config-policy-controller-0pyc-on-pull-request In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Syncing the following PRs:
The common makefile changes had some conflicts which I resolved (maybe even correctly).
Closes #454