Skip to content

Commit

Permalink
[rlp-v2] Sync RLPv2 base branch with main (#214)
Browse files Browse the repository at this point in the history
* Build images with replaces image (#193)

* [makefile] Updating the `replaces` directive in CSV

* [gh workflow] Adding `replacesVersion` as input for workflow_dispatch

* [config] Adding default replaces operator value

* [bundle] Updated bundle

* Building the catalog with the replaces directive (#194)

* [catalog] Building the catalog with the replaces directive

* [catalog] Setting default replaces version to `0.0.0-alpha`

* [bundle] Updating config and bundle with new default release version

* upgrade operator-sdk v1.28.1

* fix verify-bundle task

* Create a ServiceMeshMember, rather than mutating the ServiceMeshMemberRoll

* Fixed access to servicemeshmember

* [test] Unit-tests for common/k8s_utils.go (part 2 of 3) (#191)

* test: Add unit-tests to StatusConditionsMarshalJSON (#167)

* test: Add unit-tests to IsOwnedBy (#167)

* refactor: Add comment to IsOwnedBy (#167)

* test: Add unit-test to GetServicePortNumber (#167)

* Update gateway-api module to v0.6.2 (#153)

* Update gateway api dep to v0.6.2
Update controller runtime
Set go version 1.19
Use github.com/onsi/ginkgo/v2 which is used by the latest version if controller-runtime (envtest).

* Update GatewayClass, Gateway and HTTPRoute to v1beta1

Since v0.6.0 GatewayClass, Gateway and HTTPRoute have moved to the
v1beta1 version of the API and support in v1alpha2 will be removed
eventually. All references to these APIS are now updated to use v1beta1.

PolicyTargetReference are still v1alpha2.

* [test] Unit-tests for common/k8s_utils.go (part 3 of 3) & Unit-tests and improvements for common/yaml_decoder.go (#195)

* test: Add test-case to TestObjectKeyListDifference (#167)

- when inputA and inputB have no common elements then return inputA as the result

* refactor: Rename tests for ObjectKeyListDifference (#167)

* test: Add unit-tests to ContainsObjectKey (#167)

* test: Add unit-tests to FindObjectKey (#167)

* test: Add unit-tests to FindDeploymentStatusCondition (#167)

* refactor: Clarify test name in TestStatusConditionsMarshalJSON (#167)

* test: Add unit-tests to DecodeFile (#167)

* refactor, improvements: DecodeFile YAML decoder (#167)

- Refactor logger initialisation and document decoding to fail fast and return errors immediately
- Enhanced empty doc check
- Add comment to the function

* [istio] Updating registerIstioExternalAuthorizer

* Reconciles also the Istio ConfigMap with the external authorizers
* If the IstioOperator CR returns an error, it continues reconciling CM

* [istio] Updating the unregisterExternalAuthorizerIstio

* With the new functionality

* [mesh config] Refactoring and testing mesh config functionality

* [makefile] Splitting local deploy in different target

* [istio] Refactoring using wrapper structs

* [go] Fixing dependencies

* [mesh config] Refactoring mesh config objects and fns

* [controller] Fixing registering logic

* Still relying on the istio CRD being installed. If not, means no istio
* If it's 404, means it's installed other way than it's operator
* If any other error happens, istio is installed, but an error occurred

* [controller] Refactoring istio installation process

* Added ENV for CM name

* [refactor] Using apierrors.IsNotFound instead of crafting the error msg

* kind: bump to 0.20.0 and pin image to kindest/node:v1.27.3 (#209)

* Upgrade Authorino and Authorino Operator to latest (#211)

* Authorino v0.14.0
* Authorino Operator v0.8.0

* workflow: use go1.19 to align with go.mod go version used (#213)

* workflow: use go1.19 to align with go.mod go version used

* doc: fix operator-sdk & kind versions used for development

---------

Co-authored-by: dd di cesare <4183971+didierofrivia@users.noreply.github.com>
Co-authored-by: Eguzki Astiz Lezaun <eastizle@redhat.com>
Co-authored-by: Alex Snaps <alex@wcgw.dev>
Co-authored-by: artem_tiupin <70763601+art-tapin@users.noreply.github.com>
Co-authored-by: Michael Nairn <mnairn@redhat.com>
Co-authored-by: dd di cesare <didi@posteo.net>
Co-authored-by: Kevin Fan <chfan@redhat.com>
  • Loading branch information
8 people committed Jul 14, 2023
1 parent 8f18d43 commit ad99202
Show file tree
Hide file tree
Showing 17 changed files with 1,919 additions and 648 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-images-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ jobs:
name: Build Bundle
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.18.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: 1.18.x
go-version: 1.19.x
id: go
- name: Check out code
uses: actions/checkout@v2
Expand Down Expand Up @@ -147,10 +147,10 @@ jobs:
needs: [build, build-bundle]
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.18.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: 1.18.x
go-version: 1.19.x
id: go
- name: Check out code
uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/code-style.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
importpath: golang.org/x/tools/cmd/goimports@latest

steps:
- name: Set up Go 1.18.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: 1.18.x
go-version: 1.19.x
id: go

- name: Check out code
Expand Down Expand Up @@ -90,10 +90,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Set up Go 1.18.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: 1.18.x
go-version: 1.19.x
id: go

- name: Check out code
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Unit Tests
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
platform: [ ubuntu-latest ]
runs-on: ${{ matrix.platform }}
defaults:
Expand Down Expand Up @@ -46,10 +46,10 @@ jobs:
run:
shell: bash
steps:
- name: Set up Go 1.18.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: 1.18.x
go-version: 1.19.x
id: go
- name: Check out code
uses: actions/checkout@v2
Expand All @@ -59,7 +59,7 @@ jobs:
- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.2.0
with:
version: v0.11.0
version: v0.20.0
config: utils/kind-cluster.yaml
cluster_name: ${{ env.KIND_CLUSTER_NAME }}
wait: 120s
Expand All @@ -80,10 +80,10 @@ jobs:
name: Verify manifests
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.18.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: 1.18.x
go-version: 1.19.x
id: go
- name: Check out code
uses: actions/checkout@v2
Expand All @@ -95,10 +95,10 @@ jobs:
name: Verify bundle
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.18.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: 1.18.x
go-version: 1.19.x
id: go
- name: Check out code
uses: actions/checkout@v2
Expand All @@ -110,10 +110,10 @@ jobs:
name: Verify fmt
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.18.x
- name: Set up Go 1.19.x
uses: actions/setup-go@v2
with:
go-version: 1.18.x
go-version: 1.19.x
id: go
- name: Check out code
uses: actions/checkout@v2
Expand All @@ -125,7 +125,7 @@ jobs:
name: Test Scripts
strategy:
matrix:
go-version: [ 1.18.x ]
go-version: [ 1.19.x ]
platform: [ ubuntu-latest, macos-latest ]
runs-on: ${{ matrix.platform }}
defaults:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.18 as builder
FROM golang:1.19 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ $(OPM):
opm: $(OPM) ## Download opm locally if necessary.

KIND = $(PROJECT_PATH)/bin/kind
KIND_VERSION = v0.17.0
KIND_VERSION = v0.20.0
$(KIND):
$(call go-install-tool,$(KIND),sigs.k8s.io/kind@$(KIND_VERSION))

Expand Down Expand Up @@ -269,9 +269,8 @@ test-unit: clean-cov generate fmt vet ## Run Unit tests.
namespace: ## Creates a namespace where to deploy Kuadrant Operator
kubectl create namespace $(KUADRANT_NAMESPACE)

.PHONY: local-setup
local-setup: $(KIND) ## Deploy locally kuadrant operator from the current code
$(MAKE) local-env-setup
.PHONY: local-deploy
local-deploy: ## Deploy Kuadrant Operator in the cluster pointed by KUBECONFIG
$(MAKE) docker-build IMG=$(IMAGE_TAG_BASE):dev
$(KIND) load docker-image $(IMAGE_TAG_BASE):dev --name $(KIND_CLUSTER_NAME)
$(MAKE) deploy IMG=$(IMAGE_TAG_BASE):dev
Expand All @@ -284,6 +283,11 @@ local-setup: $(KIND) ## Deploy locally kuadrant operator from the current code
@echo "curl -H \"Host: myhost.com\" localhost:9080"
@echo

.PHONY: local-setup
local-setup: $(KIND) ## Deploy locally kuadrant operator from the current code
$(MAKE) local-env-setup
$(MAKE) local-deploy

.PHONY: local-cleanup
local-cleanup: ## Delete local cluster
$(MAKE) kind-delete-cluster
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
containerImage: quay.io/kuadrant/kuadrant-operator:latest
createdAt: "2023-05-31T13:23:21Z"
createdAt: "2023-07-13T09:25:11Z"
operators.operatorframework.io/builder: operator-sdk-v1.28.1
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/Kuadrant/kuadrant-operator
Expand Down
Loading

0 comments on commit ad99202

Please sign in to comment.