From 0d66b2e8589fe0393f69fd13e6540f11ca383e87 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 22 Nov 2023 16:04:12 +0000 Subject: [PATCH] chore(release): Manifests update --- deploy/openshift/basic/deployment.yaml | 52 +++++++++++ deploy/openshift/basic/halyard_config_map.yml | 21 +++++ deploy/openshift/basic/role.yaml | 80 ++++++++++++++++ deploy/openshift/basic/role_binding.yaml | 11 +++ deploy/openshift/basic/service_account.yaml | 4 + deploy/openshift/cluster/deployment.yaml | 46 +++++++++ .../openshift/cluster/halyard_config_map.yml | 21 +++++ deploy/openshift/cluster/role.yaml | 93 +++++++++++++++++++ deploy/openshift/cluster/role_binding.yaml | 12 +++ deploy/openshift/cluster/service_account.yaml | 4 + deploy/operator/basic/deployment.yaml | 4 +- deploy/operator/cluster/deployment.yaml | 4 +- deploy/operator/helm/Chart.yaml | 4 +- deploy/operator/helm/values.yaml | 4 +- 14 files changed, 352 insertions(+), 8 deletions(-) create mode 100644 deploy/openshift/basic/deployment.yaml create mode 100644 deploy/openshift/basic/halyard_config_map.yml create mode 100644 deploy/openshift/basic/role.yaml create mode 100644 deploy/openshift/basic/role_binding.yaml create mode 100644 deploy/openshift/basic/service_account.yaml create mode 100644 deploy/openshift/cluster/deployment.yaml create mode 100644 deploy/openshift/cluster/halyard_config_map.yml create mode 100644 deploy/openshift/cluster/role.yaml create mode 100644 deploy/openshift/cluster/role_binding.yaml create mode 100644 deploy/openshift/cluster/service_account.yaml diff --git a/deploy/openshift/basic/deployment.yaml b/deploy/openshift/basic/deployment.yaml new file mode 100644 index 0000000..738b6b0 --- /dev/null +++ b/deploy/openshift/basic/deployment.yaml @@ -0,0 +1,52 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: spinnaker-operator +spec: + replicas: 1 + selector: + matchLabels: + name: spinnaker-operator + template: + metadata: + labels: + name: spinnaker-operator + spec: + serviceAccountName: spinnaker-operator + containers: + - name: spinnaker-operator + image: armory/armory-operator:dev-ubi # Moving label, replaced at build time with a fixed version in "build" dir + command: + - spinnaker-operator + args: + - --disable-admission-controller + imagePullPolicy: Always + env: + - name: WATCH_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: OPERATOR_NAME + value: "spinnaker-operator" + - name: halyard + image: armory/halyard-armory:operator-dev-ubi # Moving label, replaced at build time with a fixed version in "build" dir + imagePullPolicy: Always + ports: + - containerPort: 8064 + protocol: TCP + readinessProbe: + httpGet: + path: /health + port: 8064 + failureThreshold: 20 + periodSeconds: 5 + initialDelaySeconds: 20 + livenessProbe: + tcpSocket: + port: 8064 + initialDelaySeconds: 30 + periodSeconds: 20 diff --git a/deploy/openshift/basic/halyard_config_map.yml b/deploy/openshift/basic/halyard_config_map.yml new file mode 100644 index 0000000..3f4eec7 --- /dev/null +++ b/deploy/openshift/basic/halyard_config_map.yml @@ -0,0 +1,21 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: halyard-config-map +data: + config: | + halyard: + halconfig: + directory: /Users/spinnaker/.hal + spinnaker: + config: + input: + bucket: halconfig + region: us-west-2 + secrets: + vault: + enabled: false + url: + path: + role: + authMethod: \ No newline at end of file diff --git a/deploy/openshift/basic/role.yaml b/deploy/openshift/basic/role.yaml new file mode 100644 index 0000000..ab4642a --- /dev/null +++ b/deploy/openshift/basic/role.yaml @@ -0,0 +1,80 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + creationTimestamp: null + name: spinnaker-operator +rules: +- apiGroups: + - "" + resources: + - pods + - services + - endpoints + - persistentvolumeclaims + - events + - configmaps + - secrets + - namespaces + verbs: + - '*' +- apiGroups: + - batch + - extensions + resources: + - jobs + verbs: + - '*' +- apiGroups: + - apps + - extensions + resources: + - secrets/finalizers + - deployments/finalizers + - deployments + - daemonsets + - replicasets + - statefulsets + verbs: + - '*' +- apiGroups: + - monitoring.coreos.com + resources: + - servicemonitors + verbs: + - get + - create +- apiGroups: + - apps + resourceNames: + - spinnaker-operator + resources: + - deployments/finalizers + verbs: + - update +- apiGroups: + - spinnaker.armory.io + resources: + - '*' + - spinnakerservices + verbs: + - '*' +- apiGroups: + - spinnaker.io + resources: + - spinnakeraccounts + verbs: + - create + - get + - list + - update + - watch + - patch +- apiGroups: + - networking.k8s.io + - extensions + resources: + - ingresses + verbs: + - get + - list + - watch \ No newline at end of file diff --git a/deploy/openshift/basic/role_binding.yaml b/deploy/openshift/basic/role_binding.yaml new file mode 100644 index 0000000..dee9b7c --- /dev/null +++ b/deploy/openshift/basic/role_binding.yaml @@ -0,0 +1,11 @@ +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: spinnaker-operator +subjects: +- kind: ServiceAccount + name: spinnaker-operator +roleRef: + kind: Role + name: spinnaker-operator + apiGroup: rbac.authorization.k8s.io diff --git a/deploy/openshift/basic/service_account.yaml b/deploy/openshift/basic/service_account.yaml new file mode 100644 index 0000000..48c8af7 --- /dev/null +++ b/deploy/openshift/basic/service_account.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: spinnaker-operator diff --git a/deploy/openshift/cluster/deployment.yaml b/deploy/openshift/cluster/deployment.yaml new file mode 100644 index 0000000..4a9fed6 --- /dev/null +++ b/deploy/openshift/cluster/deployment.yaml @@ -0,0 +1,46 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: spinnaker-operator +spec: + replicas: 1 + selector: + matchLabels: + name: spinnaker-operator + template: + metadata: + labels: + name: spinnaker-operator + spec: + serviceAccountName: spinnaker-operator + containers: + - name: spinnaker-operator + image: armory/armory-operator:dev-ubi # Moving label, replaced at build time with a fixed version in "build" dir + command: + - spinnaker-operator + imagePullPolicy: Always + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: OPERATOR_NAME + value: "spinnaker-operator" + - name: halyard + image: armory/halyard-armory:operator-dev-ubi # Moving label, replaced at build time with a fixed version in "build" dir + imagePullPolicy: Always + ports: + - containerPort: 8064 + protocol: TCP + readinessProbe: + httpGet: + path: /health + port: 8064 + failureThreshold: 20 + periodSeconds: 5 + initialDelaySeconds: 20 + livenessProbe: + tcpSocket: + port: 8064 + initialDelaySeconds: 30 + periodSeconds: 20 diff --git a/deploy/openshift/cluster/halyard_config_map.yml b/deploy/openshift/cluster/halyard_config_map.yml new file mode 100644 index 0000000..1389f46 --- /dev/null +++ b/deploy/openshift/cluster/halyard_config_map.yml @@ -0,0 +1,21 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: halyard-config-map +data: + config: | + halyard: + halconfig: + directory: /Users/spinnaker/.hal + spinnaker: + config: + input: + bucket: halconfig + region: us-west-2 + secrets: + vault: + enabled: false + url: https://vault.url + path: example + role: example + authMethod: KUBERNETES \ No newline at end of file diff --git a/deploy/openshift/cluster/role.yaml b/deploy/openshift/cluster/role.yaml new file mode 100644 index 0000000..81487da --- /dev/null +++ b/deploy/openshift/cluster/role.yaml @@ -0,0 +1,93 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: spinnaker-operator-role +rules: +- apiGroups: + - "" + resources: + - pods + - ingresses/status + - endpoints + verbs: + - get + - list + - watch +- apiGroups: + - "" + resources: + - services + - events + - configmaps + - secrets + - namespaces + - ingresses + verbs: + - create + - get + - list + - update + - watch + - patch +- apiGroups: + - apps + - extensions + resources: + - secrets/finalizers + - deployments/finalizers + - deployments + - daemonsets + - replicasets + - statefulsets + verbs: + - create + - get + - list + - update + - watch + - patch +- apiGroups: + - monitoring.coreos.com + resources: + - servicemonitors + verbs: + - get + - create +- apiGroups: + - spinnaker.armory.io + resources: + - '*' + - spinnakerservices + verbs: + - create + - get + - list + - update + - watch + - patch +- apiGroups: + - spinnaker.io + resources: + - spinnakeraccounts + verbs: + - create + - get + - list + - update + - watch + - patch +- apiGroups: + - admissionregistration.k8s.io + resources: + - validatingwebhookconfigurations + verbs: + - '*' +- apiGroups: + - networking.k8s.io + - extensions + resources: + - ingresses + verbs: + - get + - list + - watch \ No newline at end of file diff --git a/deploy/openshift/cluster/role_binding.yaml b/deploy/openshift/cluster/role_binding.yaml new file mode 100644 index 0000000..4f9961d --- /dev/null +++ b/deploy/openshift/cluster/role_binding.yaml @@ -0,0 +1,12 @@ +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: spinnaker-operator-binding +subjects: +- kind: ServiceAccount + name: spinnaker-operator + namespace: spinnaker-operator # edit if you want the operator to live somewhere besides here +roleRef: + kind: ClusterRole + name: spinnaker-operator-role + apiGroup: rbac.authorization.k8s.io diff --git a/deploy/openshift/cluster/service_account.yaml b/deploy/openshift/cluster/service_account.yaml new file mode 100644 index 0000000..48c8af7 --- /dev/null +++ b/deploy/openshift/cluster/service_account.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: spinnaker-operator diff --git a/deploy/operator/basic/deployment.yaml b/deploy/operator/basic/deployment.yaml index d67ee25..fd36c74 100644 --- a/deploy/operator/basic/deployment.yaml +++ b/deploy/operator/basic/deployment.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: spinnaker-operator containers: - name: spinnaker-operator - image: armory/armory-operator:1.8.8 + image: armory/armory-operator:1.8.10 command: - spinnaker-operator args: @@ -33,7 +33,7 @@ spec: - name: OPERATOR_NAME value: "spinnaker-operator" - name: halyard - image: armory/halyard-armory:1.12.0-2c14811-operator + image: armory/halyard-armory:1.12.0-73d4524-operator imagePullPolicy: IfNotPresent ports: - containerPort: 8064 diff --git a/deploy/operator/cluster/deployment.yaml b/deploy/operator/cluster/deployment.yaml index e5bb6c5..3695c8a 100644 --- a/deploy/operator/cluster/deployment.yaml +++ b/deploy/operator/cluster/deployment.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: spinnaker-operator containers: - name: spinnaker-operator - image: armory/armory-operator:1.8.8 + image: armory/armory-operator:1.8.10 command: - spinnaker-operator imagePullPolicy: IfNotPresent @@ -29,7 +29,7 @@ spec: - name: DEBUG_ENDPOINT value: "https://debug.armory.io" - name: halyard - image: armory/halyard-armory:1.12.0-2c14811-operator + image: armory/halyard-armory:1.12.0-73d4524-operator imagePullPolicy: IfNotPresent ports: - containerPort: 8064 diff --git a/deploy/operator/helm/Chart.yaml b/deploy/operator/helm/Chart.yaml index c5a2d21..8a37965 100644 --- a/deploy/operator/helm/Chart.yaml +++ b/deploy/operator/helm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: 1.8.8 -version: 1.8.8 +appVersion: 1.8.10 +version: 1.8.10 description: Provides easy installation of the Armory Spinnaker Operator name: armory-spinnaker-operator icon: https://i.imgur.com/g9Cv9A9.jpg diff --git a/deploy/operator/helm/values.yaml b/deploy/operator/helm/values.yaml index e222514..2e979cf 100644 --- a/deploy/operator/helm/values.yaml +++ b/deploy/operator/helm/values.yaml @@ -36,7 +36,7 @@ spinnakerOperator: disableAdmissionController: false image: repository: index.docker.io/armory/armory-operator - tag: 1.8.8 + tag: 1.8.10 pullPolicy: IfNotPresent resources: {} @@ -46,7 +46,7 @@ spinnakerOperator: halyard: image: repository: index.docker.io/armory/halyard-armory - tag: 1.12.0-2c14811-operator + tag: 1.12.0-73d4524-operator pullPolicy: IfNotPresent resources: {}