From 356edcc1793545fe3666f8de6e501718d47aaab6 Mon Sep 17 00:00:00 2001 From: Shawn Watson Date: Mon, 12 Feb 2024 15:09:55 -0500 Subject: [PATCH 1/4] update cp values --- ca.srl | 1 + istio-system.json-e | 67 +++++++++++++++++++++++++++++++++++++ prep_controlplane_values.sh | 8 +++-- 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 ca.srl create mode 100644 istio-system.json-e diff --git a/ca.srl b/ca.srl new file mode 100644 index 0000000..83fbb89 --- /dev/null +++ b/ca.srl @@ -0,0 +1 @@ +4A2E6ADE639A0F170E9CAAB0D80D1D52D0D19E1C diff --git a/istio-system.json-e b/istio-system.json-e new file mode 100644 index 0000000..ea95d78 --- /dev/null +++ b/istio-system.json-e @@ -0,0 +1,67 @@ +{ + "apiVersion": "v1", + "kind": "Namespace", + "metadata": { + "annotations": { + "tsb.tetrate.io/contentHash": "68a087286e03792d" + }, + "creationTimestamp": "2023-10-26T14:00:39Z", + "deletionTimestamp": "2023-10-26T14:38:29Z", + "labels": { + "istio-operator-managed": "Reconcile", + "kubernetes.io/metadata.name": "istio-system", + "name": "istio-system", + "platform.tsb.tetrate.io/component": "base", + "platform.tsb.tetrate.io/plane": "control", + "xcp-edge-validation": "enabled" + }, + "name": "istio-system", + "resourceVersion": "84117", + "uid": "6a59646f-f80d-4a73-8c76-9b46a485f53e" + }, + "spec": { + "finalizers": [ + "kubernetes" + ] + }, + "status": { + "conditions": [ + { + "lastTransitionTime": "2023-10-26T14:38:35Z", + "message": "Discovery failed for some groups, 1 failing: unable to retrieve the complete list of server APIs: external.metrics.k8s.io/v1beta1: stale GroupVersion discovery: external.metrics.k8s.io/v1beta1", + "reason": "DiscoveryFailed", + "status": "True", + "type": "NamespaceDeletionDiscoveryFailure" + }, + { + "lastTransitionTime": "2023-10-26T14:38:39Z", + "message": "All legacy kube types successfully parsed", + "reason": "ParsedGroupVersions", + "status": "False", + "type": "NamespaceDeletionGroupVersionParsingFailure" + }, + { + "lastTransitionTime": "2023-10-26T14:38:39Z", + "message": "All content successfully deleted, may be waiting on finalization", + "reason": "ContentDeleted", + "status": "False", + "type": "NamespaceDeletionContentFailure" + }, + { + "lastTransitionTime": "2023-10-26T14:38:39Z", + "message": "All content successfully removed", + "reason": "ContentRemoved", + "status": "False", + "type": "NamespaceContentRemaining" + }, + { + "lastTransitionTime": "2023-10-26T14:38:39Z", + "message": "All content-preserving finalizers finished", + "reason": "ContentHasNoFinalizers", + "status": "False", + "type": "NamespaceFinalizersRemaining" + } + ], + "phase": "Terminating" + } +} diff --git a/prep_controlplane_values.sh b/prep_controlplane_values.sh index a9af3d1..dd3ca44 100755 --- a/prep_controlplane_values.sh +++ b/prep_controlplane_values.sh @@ -60,9 +60,11 @@ spec: - name: global revisions: - name: default - - name: prod - revisions: - - name: prod-stable + istio: + tsbVersion: $VERSION + - name: canary + istio: + tsbVersion: $VERSION kubeSpec: deployment: env: From 00af5616cbefb195d2bbdb450af4afd2194aec5f Mon Sep 17 00:00:00 2001 From: Shawn Watson Date: Mon, 12 Feb 2024 15:11:01 -0500 Subject: [PATCH 2/4] Update prep_controlplane_values.sh --- prep_controlplane_values.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/prep_controlplane_values.sh b/prep_controlplane_values.sh index dd3ca44..f5f8c09 100755 --- a/prep_controlplane_values.sh +++ b/prep_controlplane_values.sh @@ -17,7 +17,6 @@ EOF tctl apply -f "$FOLDER/cluster-$CLUSTER_NAME.yaml" tctl install cluster-service-account --cluster $CLUSTER_NAME > $CLUSTER_NAME-service-account.jwk -tctl x gitops grant $CLUSTER_NAME cat << EOF > "$FOLDER/$CLUSTER_NAME-controlplane_values.yaml" image: From 71a2e1afeb500efade33ade86f07a491d4a90ba7 Mon Sep 17 00:00:00 2001 From: Sergey Marunich Date: Mon, 12 Feb 2024 18:40:03 -0500 Subject: [PATCH 3/4] Delete istio-system.json-e --- istio-system.json-e | 67 --------------------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 istio-system.json-e diff --git a/istio-system.json-e b/istio-system.json-e deleted file mode 100644 index ea95d78..0000000 --- a/istio-system.json-e +++ /dev/null @@ -1,67 +0,0 @@ -{ - "apiVersion": "v1", - "kind": "Namespace", - "metadata": { - "annotations": { - "tsb.tetrate.io/contentHash": "68a087286e03792d" - }, - "creationTimestamp": "2023-10-26T14:00:39Z", - "deletionTimestamp": "2023-10-26T14:38:29Z", - "labels": { - "istio-operator-managed": "Reconcile", - "kubernetes.io/metadata.name": "istio-system", - "name": "istio-system", - "platform.tsb.tetrate.io/component": "base", - "platform.tsb.tetrate.io/plane": "control", - "xcp-edge-validation": "enabled" - }, - "name": "istio-system", - "resourceVersion": "84117", - "uid": "6a59646f-f80d-4a73-8c76-9b46a485f53e" - }, - "spec": { - "finalizers": [ - "kubernetes" - ] - }, - "status": { - "conditions": [ - { - "lastTransitionTime": "2023-10-26T14:38:35Z", - "message": "Discovery failed for some groups, 1 failing: unable to retrieve the complete list of server APIs: external.metrics.k8s.io/v1beta1: stale GroupVersion discovery: external.metrics.k8s.io/v1beta1", - "reason": "DiscoveryFailed", - "status": "True", - "type": "NamespaceDeletionDiscoveryFailure" - }, - { - "lastTransitionTime": "2023-10-26T14:38:39Z", - "message": "All legacy kube types successfully parsed", - "reason": "ParsedGroupVersions", - "status": "False", - "type": "NamespaceDeletionGroupVersionParsingFailure" - }, - { - "lastTransitionTime": "2023-10-26T14:38:39Z", - "message": "All content successfully deleted, may be waiting on finalization", - "reason": "ContentDeleted", - "status": "False", - "type": "NamespaceDeletionContentFailure" - }, - { - "lastTransitionTime": "2023-10-26T14:38:39Z", - "message": "All content successfully removed", - "reason": "ContentRemoved", - "status": "False", - "type": "NamespaceContentRemaining" - }, - { - "lastTransitionTime": "2023-10-26T14:38:39Z", - "message": "All content-preserving finalizers finished", - "reason": "ContentHasNoFinalizers", - "status": "False", - "type": "NamespaceFinalizersRemaining" - } - ], - "phase": "Terminating" - } -} From 40d0c9ecc8e0db5c0d82ffb84e11e30201a0aa6e Mon Sep 17 00:00:00 2001 From: Sergey Marunich Date: Mon, 12 Feb 2024 18:40:12 -0500 Subject: [PATCH 4/4] Delete ca.srl --- ca.srl | 1 - 1 file changed, 1 deletion(-) delete mode 100644 ca.srl diff --git a/ca.srl b/ca.srl deleted file mode 100644 index 83fbb89..0000000 --- a/ca.srl +++ /dev/null @@ -1 +0,0 @@ -4A2E6ADE639A0F170E9CAAB0D80D1D52D0D19E1C