Skip to content

Commit 64fdd21

Browse files
qpdpQqpdpQ
authored
Migrate away from controller-filtered-cache library (#1173)
* init update Signed-off-by: Allen Li <[email protected]> * controller runtime version bump Signed-off-by: Allen Li <[email protected]> * update cache function Signed-off-by: Allen Li <[email protected]> * cache all namespace Signed-off-by: Allen Li <[email protected]> * update cache option Signed-off-by: Allen Li <[email protected]> * update watchNamespaces Signed-off-by: Allen Li <[email protected]> * upgrade jaeger-operator version for test Signed-off-by: Allen Li <[email protected]> * Replace the deprecated method Signed-off-by: Allen Li <[email protected]> * update test file Signed-off-by: Allen Li <[email protected]> * update formate Signed-off-by: Allen Li <[email protected]> * update comment Signed-off-by: Allen Li <[email protected]> * update deprecated package Signed-off-by: Allen Li <[email protected]> * add defer GinkgoRecover() method Signed-off-by: Allen Li <[email protected]> * update Signed-off-by: Allen Li <[email protected]> * increasing waiting time Signed-off-by: Allen Li <[email protected]> * increase test interval Signed-off-by: Allen Li <[email protected]> * update ginkgo version Signed-off-by: Allen Li <[email protected]> * update waiting time Signed-off-by: Allen Li <[email protected]> * upgrade ginkgo in e2e test file Signed-off-by: Allen Li <[email protected]> * update package Signed-off-by: Allen Li <[email protected]> * remove "github.com/onsi/ginkgo" to avoid redefined Signed-off-by: Allen Li <[email protected]> * remove interface Signed-off-by: Allen Li <[email protected]> * remove decorator Signed-off-by: Allen Li <[email protected]> * remove Async Testing Signed-off-by: Allen Li <[email protected]> * update e2e test Signed-off-by: Allen Li <[email protected]> * add context to suit test Signed-off-by: Allen Li <[email protected]> * allow ginkgo v1 package Signed-off-by: Allen Li <[email protected]> * remove nodetimeout Signed-off-by: Allen Li <[email protected]> * update kubebuilder versioin Signed-off-by: Allen Li <[email protected]> * remove title Signed-off-by: Allen Li <[email protected]> * update e2e test Signed-off-by: Allen Li <[email protected]> * increase e2e test time Signed-off-by: Allen Li <[email protected]> * accept a context Signed-off-by: Allen Li <[email protected]> * update cache informer Signed-off-by: Allen Li <[email protected]> * update package Signed-off-by: Allen Li <[email protected]> * add sync period and ReaderFailOnMissingInformer Signed-off-by: Allen Li <[email protected]> * update isolatedMode Signed-off-by: Allen Li <[email protected]> * add existGVKList Signed-off-by: Allen Li <[email protected]> * update formate Signed-off-by: Allen Li <[email protected]> * typo Signed-off-by: Allen Li <[email protected]> * add update cache option Signed-off-by: Allen Li <[email protected]> * remove log Signed-off-by: Allen Li <[email protected]> * add log to test Signed-off-by: Allen Li <[email protected]> * increasing waiting time Signed-off-by: Allen Li <[email protected]> * remove unused function Signed-off-by: Allen Li <[email protected]> * remove duplicate items from cache Signed-off-by: Allen Li <[email protected]> * add test logs Signed-off-by: Allen Li <[email protected]> * remove node timeout Signed-off-by: Allen Li <[email protected]> * increasing timeout time Signed-off-by: Allen Li <[email protected]> * increasing waiting time Signed-off-by: Allen Li <[email protected]> * increasing waiting time Signed-off-by: Allen Li <[email protected]> * update waiting time Signed-off-by: Allen Li <[email protected]> * add test log Signed-off-by: Allen Li <[email protected]> * typo Signed-off-by: Allen Li <[email protected]> * print operandreg info Signed-off-by: Allen Li <[email protected]> * change port Signed-off-by: Allen Li <[email protected]> * remove status check Signed-off-by: Allen Li <[email protected]> * revert testcase Signed-off-by: Allen Li <[email protected]> * update port Signed-off-by: Allen Li <[email protected]> * revert port change Signed-off-by: Allen Li <[email protected]> * tidy go mod Signed-off-by: Allen Li <[email protected]> * use reader to get list Signed-off-by: Allen Li <[email protected]> * add permission for configmap and secret Signed-off-by: Allen Li <[email protected]> * add bindaddress for metrics to avoid conflict Signed-off-by: Allen Li <[email protected]> * add label key Signed-off-by: Allen Li <[email protected]> * update namespace Signed-off-by: Allen Li <[email protected]> * remove failed testcase Signed-off-by: Allen Li <[email protected]> * update e2e testcase Signed-off-by: Allen Li <[email protected]> * update is running on kind Signed-off-by: Allen Li <[email protected]> * print reg Signed-off-by: Allen Li <[email protected]> * add details Signed-off-by: Allen Li <[email protected]> * add operatorconfig Signed-off-by: Allen Li <[email protected]> * formate issue Signed-off-by: Allen Li <[email protected]> * tidy go mod Signed-off-by: Allen Li <[email protected]> * increasing waiting time Signed-off-by: Allen Li <[email protected]> * update kustomization file Signed-off-by: Allen Li <[email protected]> * update testfile Signed-off-by: Allen Li <[email protected]> * cleanup code Signed-off-by: Allen Li <[email protected]> * remove unused log Signed-off-by: Allen Li <[email protected]> --------- Signed-off-by: Allen Li <[email protected]>
1 parent e03d071 commit 64fdd21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1695
-1435
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM docker-na-public.artifactory.swg-devops.com/hyc-cloud-private-dockerhub-docker-remote/golang:1.23.2 as builder
2+
FROM docker-na-public.artifactory.swg-devops.com/hyc-cloud-private-dockerhub-docker-remote/golang:1.23.2 AS builder
33
ARG GOARCH
44

55
WORKDIR /workspace

‎Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,8 @@ e2e-test:
238238

239239
e2e-test-kind: build-test-operator-image kind-start kind-load-img deploy-e2e e2e-test kind-delete
240240

241+
e2e-test-fyre: build-push-test-image deploy-e2e
242+
241243
scorecard: operator-sdk ## Run scorecard test
242244
@echo ... Running the scorecard test
243245
- $(OPERATOR_SDK) scorecard bundle --verbose
@@ -278,6 +280,10 @@ build-test-operator-image: $(CONFIG_DOCKER_TARGET) ## Build the operator test im
278280
--build-arg VCS_REF=$(VCS_REF) --build-arg VCS_URL=$(VCS_URL) --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
279281
--build-arg GOARCH=$(LOCAL_ARCH) -f Dockerfile .
280282

283+
build-push-test-image: build-test-operator-image ## Build and push the operator test image.
284+
@echo "Pushing the $(DEV_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(OPERATOR_TEST_TAG) docker image to $(DEV_REGISTRY)..."
285+
@docker push $(DEV_REGISTRY)/$(OPERATOR_IMAGE_NAME):$(OPERATOR_TEST_TAG)
286+
281287
##@ Release
282288

283289
build-push-dev-image: build-operator-dev-image ## Build and push the operator dev images.

‎bundle/manifests/operand-deployment-lifecycle-manager.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ spec:
636636
- s390x
637637
containers:
638638
- args:
639-
- -v=2
639+
- -v=1
640640
command:
641641
- /manager
642642
env:

‎common/scripts/lint_go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
# limitations under the License.
1616
#
1717

18-
GOGC=25 golangci-lint run -c ./common/config/.golangci.yml --timeout=600s
18+
GOGC=25 golangci-lint run -c ./common/config/.golangci.yml --timeout=900s

‎config/e2e/crd/bases/operator.ibm.com_operatorconfigs.yaml

Lines changed: 1019 additions & 0 deletions
Large diffs are not rendered by default.

‎config/e2e/crd/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ resources:
77
- bases/operator.ibm.com_operandbindinfos.yaml
88
- bases/operator.ibm.com_operandregistries.yaml
99
- bases/operator.ibm.com_namespacescopes.yaml
10+
- bases/operator.ibm.com_operatorconfigs.yaml
1011

1112

‎config/e2e/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
- command:
4747
- /manager
4848
args:
49-
- -v=2
49+
- -v=1
5050
image: icr.io/cpopen/odlm:latest
5151
name: manager
5252
resources:

‎config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
- command:
4949
- /manager
5050
args:
51-
- -v=2
51+
- -v=1
5252
env:
5353
- name: OPERATOR_NAMESPACE
5454
valueFrom:

0 commit comments

Comments
 (0)