Skip to content

WIP: Multi arch davec 01 #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
davco01a wants to merge 28 commits into from
Closed

WIP: Multi arch davec 01 #481

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
56eff0b
gara sign
davco01a Mar 23, 2023
5052596
Merge branch 'main' into gara_sign
davco01a Mar 23, 2023
122d0d3
cd pipeline and mult-arch
davco01a Mar 27, 2023
dc0c051
jenkins file updates
davco01a Mar 27, 2023
aa179c7
rco updates
davco01a Mar 27, 2023
26aa00e
rco updates
davco01a Mar 27, 2023
75de6ac
delete unneeded files
davco01a Mar 27, 2023
5ff1331
test branch
davco01a Mar 28, 2023
5618e84
Merge branch 'main' into multi-arch-davec
davco01a Mar 30, 2023
28b7f2e
review and fix
davco01a Mar 31, 2023
e204859
fix
davco01a Mar 31, 2023
f5d4b24
to rco
davco01a Mar 31, 2023
af10416
replace from main
davco01a Mar 31, 2023
52b24b5
fix from Melissa
davco01a Apr 3, 2023
057d68f
fix
davco01a Apr 3, 2023
49bc74e
rco demand ID
davco01a Apr 3, 2023
d139dc7
linter
davco01a Apr 3, 2023
43757c7
Sync scripts, Makefile and Dockerfile with WLO
idlewis Mar 28, 2023
0731479
ocp cluster sync
davco01a Apr 3, 2023
5a2af9f
Merge remote-tracking branch 'origin/wlo-sync' into multi-arch-davec-01
davco01a Apr 3, 2023
6432de8
quoted
davco01a Apr 3, 2023
bf6a3a9
comment out problem line
davco01a Apr 4, 2023
746ea28
Merge branch 'main' into multi-arch-davec-01
davco01a Apr 4, 2023
30e6160
Add supported architecture labels to CSV
idlewis Apr 4, 2023
ee19952
Add node affinity for manager deployment
idlewis Apr 4, 2023
f2ef1e3
Final makefile tweaks
idlewis Apr 4, 2023
6952490
Merge branch 'main' into multi-arch-davec-01
davco01a Apr 4, 2023
d898164
Changes from running make bundle
idlewis Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ $(CONTROLLER_GEN): $(LOCALBIN)
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/[email protected]

KUSTOMIZE ?= $(LOCALBIN)/kustomize
# TODO iain - This was 3.8.7 in previous version
KUSTOMIZE_VERSION ?= 4.5.5
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/kustomize/v${KUSTOMIZE_VERSION}/hack/install_kustomize.sh"
.PHONY: kustomize
Expand Down Expand Up @@ -196,25 +195,11 @@ bundle: manifests setup kustomize ## Generate bundle manifests and metadata, the
$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle $(BUNDLE_GEN_FLAGS)
./scripts/csv_description_update.sh update_csv

# $(KUSTOMIZE) build config/kustomize/crd -o internal/deploy/kustomize/daily/base/websphere-liberty-crd.yaml
$(KUSTOMIZE) build config/kustomize/crd -o deploy/kustomize/daily/base/runtime-component-crd.yaml
cd config/kustomize/operator && $(KUSTOMIZE) edit set namespace $(KUSTOMIZE_NAMESPACE)
# $(KUSTOMIZE) build config/kustomize/operator -o internal/deploy/kustomize/daily/base/websphere-liberty-deployment.yaml
$(KUSTOMIZE) build config/kustomize/operator -o deploy/kustomize/daily/base/runtime-component-operator.yaml
# This does two replacements
# ${IMG} becomes ${KUSTOMIZE_IMG}
# serviceAccountName: controller-manager becomes serviceAccountName: websphere-liberty-controller-manager
# The second one looks unneeded, as the equivalent is already in the deployment file
# TODO iain
# Not sure about the first
# Probably
# sed -i.bak "s,${IMG},${KUSTOMIZE_IMG},g;s,serviceAccountName: controller-manager,serviceAccountName: websphere-liberty-controller-manager,g" internal/deploy/kustomize/daily/base/websphere-liberty-deployment.yaml
sed -i.bak "s,${IMG},${KUSTOMIZE_IMG},g" deploy/kustomize/daily/base/runtime-component-operator.yaml
Copy link
Member

@leochr leochr Apr 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@idlewis In order for this change to be made, the image value within kustomize/daily folder (here) should have the new image

# TODO iain - I think these are included in the deployment file for RCO
# $(KUSTOMIZE) build config/kustomize/roles -o internal/deploy/kustomize/daily/base/websphere-liberty-roles.yaml
Copy link
Member

@leochr leochr Apr 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@idlewis Although the roles are included now in the deploy/kustomize/daily folder, we need this to continue to ensure that it's automatically updated in the future if/when roles change


mv config/manifests/patches/csvAnnotations.yaml.bak config/manifests/patches/csvAnnotations.yaml
# rm internal/deploy/kustomize/daily/base/websphere-liberty-deployment.yaml.bak
operator-sdk bundle validate ./bundle

.PHONY: fmt
Expand All @@ -234,7 +219,6 @@ test: manifests generate fmt vet ## Run tests.

.PHONY: unit-test
unit-test: ## Run unit tests
# go test -v -mod=vendor -tags=unit github.com/WASdev/websphere-liberty-operator/...
go test -v -mod=vendor -tags=unit github.com/application-stacks/runtime-component-operator/...

.PHONY: run
Expand Down