Skip to content

Commit

Permalink
Feature/limit awscfg output (#48)
Browse files Browse the repository at this point in the history
  • Loading branch information
pns-nirmata authored Dec 19, 2022
1 parent f79959d commit 05c0c9f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 59 deletions.
9 changes: 0 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,6 @@ install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~
uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
$(KUSTOMIZE) build config/crd | kubectl delete --ignore-not-found=$(ignore-not-found) -f -

.PHONY: deploy
deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
$(KUSTOMIZE) build config/default | kubectl apply -f -

.PHONY: undeploy
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(ignore-not-found) -f -

##@ Build Dependencies

## Location to install dependencies to
Expand Down
2 changes: 1 addition & 1 deletion charts/kyverno-aws-adapter/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: kyverno-aws-adapter
description: Helm chart for the Kyverno AWS Adapter
type: application
version: v0.1.0
version: v0.1.1
appVersion: v0.1.0
keywords:
- kubernetes
Expand Down
2 changes: 1 addition & 1 deletion charts/kyverno-aws-adapter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Helm chart for the Kyverno AWS Adapter

![Version: v0.1.0](https://img.shields.io/badge/Version-v0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
![Version: v0.1.1](https://img.shields.io/badge/Version-v0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)

## Description

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand All @@ -18,30 +17,18 @@ spec:
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .status.id
name: Cluster Id
type: string
- jsonPath: .spec.name
name: Cluster Name
type: string
- jsonPath: .spec.region
name: Region
type: string
- jsonPath: .status.eksCluster.status
name: Status
name: Cluster Status
type: string
- jsonPath: .status.eksCluster.kubernetesVersion
name: Kubernetes Version
type: string
- jsonPath: .status.eksCluster.platformVersion
name: Platform Version
type: string
- jsonPath: .status.lastUpdatedTimestamp
name: Last Updated
type: date
- jsonPath: .status.lastPollInfo.timestamp
name: Last Polled
type: date
- jsonPath: .status.lastPollInfo.status
name: Last Polled Status
type: string
Expand All @@ -51,23 +38,21 @@ spec:
description: AWSAdapterConfig is the Schema for the awsadapterconfigs API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: AWSAdapterConfigSpec defines the desired state of AWSAdapterConfig
properties:
name:
description: EKS cluster's name
type: string
region:
description: EKS cluster's region
type: string
required:
- name
Expand All @@ -77,7 +62,7 @@ spec:
description: AWSAdapterConfigStatus defines the observed state of AWSAdapterConfig
properties:
eksCluster:
description: Contains the EKS cluster's details
description: 'EKS cluster details fetched from AWS For details of individual fields, refer to AWS SDK docs: https://pkg.go.dev/github.com/aws/aws-sdk-go-v2/service/[email protected]/types#Cluster'
properties:
addons:
items:
Expand All @@ -88,16 +73,15 @@ spec:
certificate:
type: string
compute:
description: Contains node groups and fargate profiles of the
EKS cluster
description: EKSCompute contains node groups and fargate profiles of the EKS cluster
properties:
fargateProfiles:
items:
type: string
type: array
nodeGroups:
items:
description: Contains info of the EKS cluster's node group
description: EKSNodeGroup contains info of the EKS cluster's node group
properties:
amiReleaseVersion:
type: string
Expand All @@ -112,8 +96,7 @@ spec:
type: integer
healthIssues:
items:
description: Contains info of any health issue in
the EKS cluster's node group
description: EKSNodeGroupHealthIssue contains info of any health issue in the EKS cluster's node group
properties:
code:
type: string
Expand All @@ -134,8 +117,7 @@ spec:
type: string
type: object
launchTemplate:
description: Contains launch template info the EKS cluster's
node group
description: EC2LaunchTemplate contains launch template info the EKS cluster's node group
properties:
id:
type: string
Expand All @@ -151,8 +133,7 @@ spec:
nodeRole:
type: string
remoteAccessConfig:
description: Contains remote access configuration of
the EKS cluster's node group
description: EKSNodeGroupRemoteAccessConfig contains remote access configuration of the EKS cluster's node group
properties:
ec2SSHKey:
type: string
Expand All @@ -162,8 +143,7 @@ spec:
type: array
type: object
resources:
description: Contains info of ASG and remote access
SG for node group
description: EKSNodeGroupResources contains info of ASG and remote access SG for node group
properties:
autoScalingGroups:
items:
Expand All @@ -173,8 +153,7 @@ spec:
type: string
type: object
scalingConfig:
description: Contains scaling configuration of the
EKS cluster's node group
description: EKSNodeGroupScalingConfig contains scaling configuration of the EKS cluster's node group
properties:
desiredSize:
format: int32
Expand All @@ -198,8 +177,7 @@ spec:
type: object
taints:
items:
description: Contains info of taints in the EKS cluster's
node group
description: EKSNodeGroupTaint contains info of taints in the EKS cluster's node group
properties:
effect:
type: string
Expand All @@ -210,8 +188,7 @@ spec:
type: object
type: array
updateConfig:
description: Contains number/percentage of node groups
that can be updated in parallel
description: EKSNodeGroupUpdateConfig contains number/percentage of node groups that can be updated in parallel
properties:
maxUnavailable:
format: int32
Expand All @@ -227,7 +204,7 @@ spec:
type: string
encryptionConfig:
items:
description: Contains encryption configuration of the EKS cluster
description: EKSEncryptionConfig contains encryption configuration of the EKS cluster
properties:
keyARN:
type: string
Expand All @@ -248,7 +225,7 @@ spec:
kubernetesVersion:
type: string
logging:
description: Contains info of which logs are enabled
description: EKSLogging contains info of which logs are enabled
properties:
apiServer:
type: boolean
Expand All @@ -264,7 +241,7 @@ spec:
name:
type: string
networking:
description: Contains networking configuration of the EKS cluster
description: EKSNetworking contains networking configuration of the EKS cluster
properties:
ipFamily:
type: string
Expand All @@ -273,7 +250,7 @@ spec:
serviceIPv6CIDR:
type: string
vpc:
description: Contains VPC configuration of the EKS cluster
description: EKSVpcConfig contains VPC configuration of the EKS cluster
properties:
clusterSecurityGroupID:
type: string
Expand Down Expand Up @@ -317,11 +294,10 @@ spec:
- status
type: object
lastPollInfo:
description: Contains Timestamp, Status and Failure info of last poll
description: Information on when the adapter last tried to fetch the EKS cluster details
properties:
failure:
description: Contains the Error and relevant Message if got Failure
in last poll
description: PollFailure contains the Error and relevant Message if got Failure in last poll
properties:
error:
type: string
Expand All @@ -338,9 +314,7 @@ spec:
type: string
type: object
lastUpdatedTimestamp:
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
of cluster Important: Run "make" to regenerate code after modifying
this file'
description: Timestamp when the Status was last updated
format: date-time
type: string
required:
Expand Down

0 comments on commit 05c0c9f

Please sign in to comment.