Skip to content
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.

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

Make sure static.yaml is up to date with output of make manifests #240

Merged

Conversation

lubronzhan
Copy link
Contributor

@lubronzhan lubronzhan commented May 2, 2024

What this PR does / why we need it:

static.yaml should be consistent with output of make manifests

it shouldn't contain the ako-operator manifest, as you can see in ytt-manifest target, it's applied along with ako-operator.yaml.

# Generate manifests e.g. CRD, RBAC etc.
manifests: $(CONTROLLER_GEN) $(KUSTOMIZE)
	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
	$(KUSTOMIZE) build config/kustomize-to-ytt > config/ytt/static.yaml

# Generate manifests from ytt for AKO Operator Deployment
.PHONY: ytt-manifests
ytt-manifests: $(YTT)
	@$(YTT) -v imageTag=$(BUILD_VERSION) -f config/ytt/ako-operator.yaml -f config/ytt/static.yaml -f config/ytt/values.yaml

Should rerun it once golang is bumped
Which issue(s) this PR fixes:

Fixes #

Describe testing done for PR:

Special notes for your reviewer:

Release note:


New PR Checklist

  • Ensure PR contains only public links or terms
  • Use good commit messages
  • Squash the commits in this branch before merge to preserve our git history
  • If this PR is just an idea or POC, use a Draft PR instead of a full PR
  • Add appropriate labels according to what type of issue is being addressed.

@lubronzhan lubronzhan changed the title Make sure static.yaml is up to date Make sure static.yaml is up to date with output of make manifests May 2, 2024
@lubronzhan lubronzhan changed the title Make sure static.yaml is up to date with output of make manifests [WIP]Make sure static.yaml is up to date with output of make manifests May 6, 2024
@lubronzhan lubronzhan force-pushed the topic/lubron/fix_static_yaml branch from e148e5d to 158961c Compare May 7, 2024 00:35
@lubronzhan lubronzhan changed the title [WIP]Make sure static.yaml is up to date with output of make manifests Make sure static.yaml is up to date with output of make manifests May 7, 2024
Signed-off-by: Lubron Zhan <[email protected]>
Copy link
Contributor

@christianang christianang left a comment

Choose a reason for hiding this comment

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

I did notice that a set of resources was removed in the static.yaml by the regeneration, but I'm assuming those are no longer necessary and they were removed earlier by whatever PR forgot to regenerate.

Approved.

@lubronzhan
Copy link
Contributor Author

Yeah it shouldn't contain the ako-operator manifest anymore, as you can see in ytt-manifest target, it's applied along with ako-operator.yaml.

# Generate manifests from ytt for AKO Operator Deployment
.PHONY: ytt-manifests
ytt-manifests: $(YTT)
	@$(YTT) -v imageTag=$(BUILD_VERSION) -f config/ytt/ako-operator.yaml -f config/ytt/static.yaml -f config/ytt/values.yaml

@lubronzhan lubronzhan merged commit aeacc93 into vmware-tanzu:main May 7, 2024
4 checks passed
@lubronzhan lubronzhan deleted the topic/lubron/fix_static_yaml branch May 7, 2024 23:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants