Skip to content

Commit

Permalink
Added kube-rbac-proxy to CloudStack bundles. (#2854)
Browse files Browse the repository at this point in the history 
* Added kube-rbac-proxy to CloudStack bundles.

* Updated eks-a CRD defs to include the new kubeRbacProxy attribute in bundle def for CloudStack.
  • Loading branch information
@jweite-amazon
jweite-amazon authored Aug 4, 2022
1 parent 3b2c021 commit 127164d
Show file tree
Hide file tree
Showing 9 changed files with 167 additions and 0 deletions.
30 changes: 30 additions & 0 deletions config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,35 @@ spec:
description: URI points to the manifest yaml file
type: string
type: object
kubeRbacProxy:
properties:
arch:
description: Architectures of the asset
items:
type: string
type: array
description:
type: string
imageDigest:
description: The SHA256 digest of the image manifest
type: string
name:
description: The asset name
type: string
os:
description: Operating system of the asset
enum:
- linux
- darwin
- windows
type: string
osName:
description: Name of the OS like ubuntu, bottlerocket
type: string
uri:
description: The image repository, name, and tag
type: string
type: object
kubeVip:
properties:
arch:
Expand Down Expand Up @@ -625,6 +654,7 @@ spec:
required:
- clusterAPIController
- components
- kubeRbacProxy
- kubeVip
- metadata
- version
Expand Down
30 changes: 30 additions & 0 deletions config/manifest/eksa-components.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,35 @@ spec:
description: URI points to the manifest yaml file
type: string
type: object
kubeRbacProxy:
properties:
arch:
description: Architectures of the asset
items:
type: string
type: array
description:
type: string
imageDigest:
description: The SHA256 digest of the image manifest
type: string
name:
description: The asset name
type: string
os:
description: Operating system of the asset
enum:
- linux
- darwin
- windows
type: string
osName:
description: Name of the OS like ubuntu, bottlerocket
type: string
uri:
description: The image repository, name, and tag
type: string
type: object
kubeVip:
properties:
arch:
Expand Down Expand Up @@ -793,6 +822,7 @@ spec:
required:
- clusterAPIController
- components
- kubeRbacProxy
- kubeVip
- metadata
- version
Expand Down
1 change: 1 addition & 0 deletions release/api/v1alpha1/artifacts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ func (vb *VersionsBundle) Ovas() []Archive {
func (vb *VersionsBundle) CloudStackImages() []Image {
return []Image{
vb.CloudStack.ClusterAPIController,
vb.CloudStack.KubeRbacProxy,
vb.CloudStack.KubeVip,
}
}
Expand Down
1 change: 1 addition & 0 deletions release/api/v1alpha1/bundle_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ type DockerBundle struct {
type CloudStackBundle struct {
Version string `json:"version"`
ClusterAPIController Image `json:"clusterAPIController"`
KubeRbacProxy Image `json:"kubeRbacProxy"`
KubeVip Image `json:"kubeVip"`
Components Manifest `json:"components"`
Metadata Manifest `json:"metadata"`
Expand Down
1 change: 1 addition & 0 deletions release/api/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions release/config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,35 @@ spec:
description: URI points to the manifest yaml file
type: string
type: object
kubeRbacProxy:
properties:
arch:
description: Architectures of the asset
items:
type: string
type: array
description:
type: string
imageDigest:
description: The SHA256 digest of the image manifest
type: string
name:
description: The asset name
type: string
os:
description: Operating system of the asset
enum:
- linux
- darwin
- windows
type: string
osName:
description: Name of the OS like ubuntu, bottlerocket
type: string
uri:
description: The image repository, name, and tag
type: string
type: object
kubeVip:
properties:
arch:
Expand Down Expand Up @@ -625,6 +654,7 @@ spec:
required:
- clusterAPIController
- components
- kubeRbacProxy
- kubeVip
- metadata
- version
Expand Down
2 changes: 2 additions & 0 deletions release/pkg/bundles/cloudstack.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ func GetCloudStackBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]
cloudstackBundleArtifacts := map[string][]releasetypes.Artifact{
"cluster-api-provider-cloudstack": r.BundleArtifactsTable["cluster-api-provider-cloudstack"],
"kube-vip": r.BundleArtifactsTable["kube-vip"],
"kube-rbac-proxy": r.BundleArtifactsTable["kube-rbac-proxy"],
}

var sourceBranch string
Expand Down Expand Up @@ -90,6 +91,7 @@ func GetCloudStackBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]
Version: version,
ClusterAPIController: bundleImageArtifacts["cluster-api-provider-cloudstack"],
KubeVip: bundleImageArtifacts["kube-vip"],
KubeRbacProxy: bundleImageArtifacts["kube-rbac-proxy"],
Components: bundleManifestArtifacts["infrastructure-components.yaml"],
Metadata: bundleManifestArtifacts["metadata.yaml"],
}
Expand Down
36 changes: 36 additions & 0 deletions release/pkg/test/testdata/main-bundle-release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,15 @@ spec:
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/cluster-api-provider-cloudstack/release/manager:v0.4.6-rc1-eks-a-v0.0.0-dev-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-cloudstack/manifests/infrastructure-cloudstack/v0.4.6-rc1/infrastructure-components.yaml
kubeRbacProxy:
arch:
- amd64
- arm64
description: Container image for kube-rbac-proxy image
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kube-rbac-proxy
os: linux
uri: public.ecr.aws/release-container-registry/brancz/kube-rbac-proxy:v0.13.0-eks-a-v0.0.0-dev-build.1
kubeVip:
arch:
- amd64
Expand Down Expand Up @@ -941,6 +950,15 @@ spec:
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/cluster-api-provider-cloudstack/release/manager:v0.4.6-rc1-eks-a-v0.0.0-dev-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-cloudstack/manifests/infrastructure-cloudstack/v0.4.6-rc1/infrastructure-components.yaml
kubeRbacProxy:
arch:
- amd64
- arm64
description: Container image for kube-rbac-proxy image
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kube-rbac-proxy
os: linux
uri: public.ecr.aws/release-container-registry/brancz/kube-rbac-proxy:v0.13.0-eks-a-v0.0.0-dev-build.1
kubeVip:
arch:
- amd64
Expand Down Expand Up @@ -1728,6 +1746,15 @@ spec:
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/cluster-api-provider-cloudstack/release/manager:v0.4.6-rc1-eks-a-v0.0.0-dev-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-cloudstack/manifests/infrastructure-cloudstack/v0.4.6-rc1/infrastructure-components.yaml
kubeRbacProxy:
arch:
- amd64
- arm64
description: Container image for kube-rbac-proxy image
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kube-rbac-proxy
os: linux
uri: public.ecr.aws/release-container-registry/brancz/kube-rbac-proxy:v0.13.0-eks-a-v0.0.0-dev-build.1
kubeVip:
arch:
- amd64
Expand Down Expand Up @@ -2515,6 +2542,15 @@ spec:
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/cluster-api-provider-cloudstack/release/manager:v0.4.6-rc1-eks-a-v0.0.0-dev-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-cloudstack/manifests/infrastructure-cloudstack/v0.4.6-rc1/infrastructure-components.yaml
kubeRbacProxy:
arch:
- amd64
- arm64
description: Container image for kube-rbac-proxy image
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kube-rbac-proxy
os: linux
uri: public.ecr.aws/release-container-registry/brancz/kube-rbac-proxy:v0.13.0-eks-a-v0.0.0-dev-build.1
kubeVip:
arch:
- amd64
Expand Down
36 changes: 36 additions & 0 deletions release/pkg/test/testdata/release-0.10-bundle-release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,15 @@ spec:
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/cluster-api-provider-cloudstack/release/manager:v0.4.5-rc5-eks-a-v0.0.0-dev-release-0.10-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-release-0.10-build.0/cluster-api-provider-cloudstack/manifests/infrastructure-cloudstack/v0.4.5-rc5/infrastructure-components.yaml
kubeRbacProxy:
arch:
- amd64
- arm64
description: Container image for kube-rbac-proxy image
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kube-rbac-proxy
os: linux
uri: public.ecr.aws/release-container-registry/brancz/kube-rbac-proxy:v0.8.0-eks-a-v0.0.0-dev-release-0.10-build.1
kubeVip:
arch:
- amd64
Expand Down Expand Up @@ -914,6 +923,15 @@ spec:
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/cluster-api-provider-cloudstack/release/manager:v0.4.5-rc5-eks-a-v0.0.0-dev-release-0.10-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-release-0.10-build.0/cluster-api-provider-cloudstack/manifests/infrastructure-cloudstack/v0.4.5-rc5/infrastructure-components.yaml
kubeRbacProxy:
arch:
- amd64
- arm64
description: Container image for kube-rbac-proxy image
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kube-rbac-proxy
os: linux
uri: public.ecr.aws/release-container-registry/brancz/kube-rbac-proxy:v0.8.0-eks-a-v0.0.0-dev-release-0.10-build.1
kubeVip:
arch:
- amd64
Expand Down Expand Up @@ -1674,6 +1692,15 @@ spec:
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/cluster-api-provider-cloudstack/release/manager:v0.4.5-rc5-eks-a-v0.0.0-dev-release-0.10-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-release-0.10-build.0/cluster-api-provider-cloudstack/manifests/infrastructure-cloudstack/v0.4.5-rc5/infrastructure-components.yaml
kubeRbacProxy:
arch:
- amd64
- arm64
description: Container image for kube-rbac-proxy image
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kube-rbac-proxy
os: linux
uri: public.ecr.aws/release-container-registry/brancz/kube-rbac-proxy:v0.8.0-eks-a-v0.0.0-dev-release-0.10-build.1
kubeVip:
arch:
- amd64
Expand Down Expand Up @@ -2434,6 +2461,15 @@ spec:
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/cluster-api-provider-cloudstack/release/manager:v0.4.5-rc5-eks-a-v0.0.0-dev-release-0.10-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-release-0.10-build.0/cluster-api-provider-cloudstack/manifests/infrastructure-cloudstack/v0.4.5-rc5/infrastructure-components.yaml
kubeRbacProxy:
arch:
- amd64
- arm64
description: Container image for kube-rbac-proxy image
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kube-rbac-proxy
os: linux
uri: public.ecr.aws/release-container-registry/brancz/kube-rbac-proxy:v0.8.0-eks-a-v0.0.0-dev-release-0.10-build.1
kubeVip:
arch:
- amd64
Expand Down

0 comments on commit 127164d

Please sign in to comment.