Skip to content
This repository has been archived by the owner on Jun 28, 2023. It is now read-only.

Add package templates Antrea 0.13.3 #953

Merged
merged 5 commits into from
Jul 7, 2021

Conversation

andrewsykim
Copy link
Contributor

Signed-off-by: Andrew Sy Kim kim.andrewsy@gmail.com

What this PR does / why we need it

Add Antrea v0.13.3 package

Which issue(s) this PR fixes

N/A

Describe testing done for PR

TBD

Special notes for your reviewer

Does this PR introduce a user-facing change?

Add package templates Antrea 0.13.3

@andrewsykim
Copy link
Contributor Author

syncPeriod: 5m
fetch:
- imgpkgBundle:
image: projects.registry.vmware.com/tce/antrea@sha256:6a301c336c30b83c4aa704b557fc83af9e6e99af1a7242e9bdb1bd13d362402c
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@shyaamsn how would I generate this value? I copied this from the v0.11 tempaltes

Copy link
Contributor

@seemiller seemiller Jul 6, 2021

Choose a reason for hiding this comment

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

You would push this package up to the TCE repo, then include it here. I can do that for you.

Copy link
Contributor

@seemiller seemiller left a comment

Choose a reason for hiding this comment

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

Fix up the values.yaml file to have a imageInfo and I'll push this up to the repo and get the digest for the package.yaml file.

Also, remove the WIP from the title when you're ready.

spec:
containers:
#@overlay/match by=overlay.subset({"name":"antrea-controller"})
- image: #@ "{}/{}:{}".format(values.imageInfo.imageRepository, values.imageInfo.images.antreaImage.imagePath, values.imageInfo.images.antreaImage.tag)
Copy link
Contributor

Choose a reason for hiding this comment

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

imageInfo is missing from values.yaml
Consider adding something like:

imageInfo:
  imageRepository: www.example.com
  imagePullPolicy: foo
  images:
    antreaImage:
      imagePath: /foo/bar
      tag: foobar

You can test with the following:

cd addons/packages/antrea/0.13.3/bundle/config
ytt -f values.star -f values.yaml -f kapp-config.yaml -f overlay -f upstream

Copy link
Contributor

@shyaamsn shyaamsn Jul 7, 2021

Choose a reason for hiding this comment

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

Substituting image is not supported. Could you please remove image overlay from here. Refer to 0.11.3 antrea overlay: https://github.com/vmware-tanzu/tce/blob/main/addons/packages/antrea/0.11.3/bundle/config/overlay/antrea_overlay.yaml#L183

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ack

---
kind: ConfigMap
metadata:
name: antrea-config-ctb8mftc58
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated, thanks

#! enterpriseAntrea: true

#@ end

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated, thanks

type: copy
sources: [existing, new]
resourceMatchers:
- kindNamespaceNameMatcher: {kind: ConfigMap, namespace: kube-system, name: antrea-ca}
Copy link
Contributor

Choose a reason for hiding this comment

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

I assume the rebase rules for CABundle in APIService needs to be added.

https://github.com/vmware-tanzu/tce/pull/956/files

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was going to let @nicolehanjing update it afterwards

Copy link
Contributor

Choose a reason for hiding this comment

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

noted, will do

Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
@andrewsykim andrewsykim changed the title [WIP] Add package templates Antrea 0.13.3 Add package templates Antrea 0.13.3 Jul 7, 2021
Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
Copy link
Contributor

@shyaamsn shyaamsn left a comment

Choose a reason for hiding this comment

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

LGTM

…a@sha256:d77a9db315fa9711f74395fecd503b6d6f701592240135cd79546efd99b1e146

Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
@shyaamsn
Copy link
Contributor

shyaamsn commented Jul 7, 2021

@seemiller PR is ready now to be merged. Could you please take a look and merge . Thanks

@joshrosso joshrosso merged commit df9a9cd into vmware-tanzu:main Jul 7, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants