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

feat(controller): use CRD status subresource #789

Merged
merged 1 commit into from
Nov 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions hack/update-manifests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ if [ ! -z "${IMAGE_TAG}" ]; then
fi

echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/install.yaml"
kustomize build --load_restrictor none "${SRCROOT}/manifests/cluster-install" >> "${SRCROOT}/manifests/install.yaml"
kubectl kustomize "${SRCROOT}/manifests/cluster-install" >> "${SRCROOT}/manifests/install.yaml"
update_image "${SRCROOT}/manifests/install.yaml"

echo "${AUTOGENMSG}" > "${SRCROOT}/manifests/namespace-install.yaml"
kustomize build --load_restrictor none "${SRCROOT}/manifests/namespace-install" >> "${SRCROOT}/manifests/namespace-install.yaml"
kubectl kustomize "${SRCROOT}/manifests/namespace-install" >> "${SRCROOT}/manifests/namespace-install.yaml"
update_image "${SRCROOT}/manifests/namespace-install.yaml"
5 changes: 3 additions & 2 deletions manifests/cluster-install/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

bases:
- ../namespace-install
- ../crds
- ../base
- ../role

resources:
- argo-rollouts-clusterrole.yaml
- argo-rollouts-clusterrolebinding.yaml
3 changes: 1 addition & 2 deletions manifests/crds/rollout-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ spec:
labelSelectorPath: .status.selector
specReplicasPath: .spec.replicas
statusReplicasPath: .status.HPAReplicas
status: {}
validation:
openAPIV3Schema:
properties:
Expand Down Expand Up @@ -3059,8 +3060,6 @@ spec:
- name
- status
type: object
stableRS:
type: string
type: object
collisionCount:
format: int32
Expand Down
144 changes: 6 additions & 138 deletions manifests/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11057,11 +11057,13 @@ spec:
name: Current
type: integer
- JSONPath: .status.updatedReplicas
description: Total number of non-terminated pods targeted by this rollout that have the desired template spec
description: Total number of non-terminated pods targeted by this rollout that
have the desired template spec
name: Up-to-date
type: integer
- JSONPath: .status.availableReplicas
description: Total number of available pods (ready for at least minReadySeconds) targeted by this rollout
description: Total number of available pods (ready for at least minReadySeconds)
targeted by this rollout
name: Available
type: integer
group: argoproj.io
Expand All @@ -11078,6 +11080,7 @@ spec:
labelSelectorPath: .status.selector
specReplicasPath: .spec.replicas
statusReplicasPath: .status.HPAReplicas
status: {}
validation:
openAPIV3Schema:
properties:
Expand Down Expand Up @@ -14101,8 +14104,6 @@ spec:
- name
- status
type: object
stableRS:
type: string
type: object
collisionCount:
format: int32
Expand Down Expand Up @@ -14193,137 +14194,6 @@ metadata:
name: argo-rollouts
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/component: rollouts-controller
app.kubernetes.io/name: argo-rollouts-clusterrole
app.kubernetes.io/part-of: argo-rollouts
name: argo-rollouts-role
rules:
- apiGroups:
- argoproj.io
resources:
- rollouts
- rollouts/finalizers
verbs:
- get
- list
- watch
- update
- patch
- apiGroups:
- argoproj.io
resources:
- analysisruns
- analysisruns/finalizers
- experiments
- experiments/finalizers
verbs:
- create
- get
- list
- watch
- update
- patch
- delete
- apiGroups:
- argoproj.io
resources:
- analysistemplates
- clusteranalysistemplates
verbs:
- get
- list
- watch
- apiGroups:
- apps
resources:
- replicasets
verbs:
- create
- get
- list
- watch
- update
- patch
- delete
- apiGroups:
- ""
resources:
- services
verbs:
- get
- list
- watch
- patch
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- pods
verbs:
- list
- delete
- update
- apiGroups:
- ""
resources:
- events
verbs:
- create
- update
- patch
- apiGroups:
- extensions
resources:
- ingresses
verbs:
- create
- get
- list
- watch
- patch
- apiGroups:
- batch
resources:
- jobs
verbs:
- create
- get
- list
- watch
- update
- patch
- delete
- apiGroups:
- networking.istio.io
resources:
- virtualservices
verbs:
- watch
- get
- update
- list
- apiGroups:
- split.smi-spec.io
resources:
- trafficsplits
verbs:
- create
- watch
- get
- update
- patch
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
Expand Down Expand Up @@ -14592,9 +14462,7 @@ spec:
app.kubernetes.io/name: argo-rollouts
spec:
containers:
- args:
- --namespaced
image: argoproj/argo-rollouts:latest
- image: argoproj/argo-rollouts:latest
imagePullPolicy: Always
name: argo-rollouts
securityContext:
Expand Down
Loading